diff --git a/src/ImageSharp/Configuration.cs b/src/ImageSharp/Configuration.cs
index a9322467cb..b0291dec56 100644
--- a/src/ImageSharp/Configuration.cs
+++ b/src/ImageSharp/Configuration.cs
@@ -76,6 +76,11 @@ public Configuration(params IConfigurationModule[] configurationModules)
         /// </summary>
         public ParallelOptions ParallelOptions { get; } = new ParallelOptions { MaxDegreeOfParallelism = Environment.ProcessorCount };
 
+        /// <summary>
+        /// Gets the currently registered <see cref="IImageFormat"/>s.
+        /// </summary>
+        public IEnumerable<IImageFormat> ImageFormats => this.imageFormats;
+
         /// <summary>
         /// Gets the maximum header size of all the formats.
         /// </summary>
@@ -96,11 +101,6 @@ public Configuration(params IConfigurationModule[] configurationModules)
         /// </summary>
         internal IEnumerable<KeyValuePair<IImageFormat, IImageEncoder>> ImageEncoders => this.mimeTypeEncoders;
 
-        /// <summary>
-        /// Gets the currently registered <see cref="IImageFormat"/>s.
-        /// </summary>
-        internal IEnumerable<IImageFormat> ImageFormats => this.imageFormats;
-
 #if !NETSTANDARD1_1
         /// <summary>
         /// Gets or sets the fielsystem helper for accessing the local file system.
@@ -195,29 +195,12 @@ public void AddImageFormatDetector(IImageFormatDetector detector)
             this.SetMaxHeaderSize();
         }
 
-        /// <summary>
-        /// Creates the default instance with the following <see cref="IConfigurationModule"/>s preregistered:
-        /// <para><see cref="PngConfigurationModule"/></para>
-        /// <para><see cref="JpegConfigurationModule"/></para>
-        /// <para><see cref="GifConfigurationModule"/></para>
-        /// <para><see cref="BmpConfigurationModule"/></para>
-        /// </summary>
-        /// <returns>The default configuration of <see cref="Configuration"/></returns>
-        internal static Configuration CreateDefaultInstance()
-        {
-            return new Configuration(
-                new PngConfigurationModule(),
-                new JpegConfigurationModule(),
-                new GifConfigurationModule(),
-                new BmpConfigurationModule());
-        }
-
         /// <summary>
         /// For the specified mime type find the decoder.
         /// </summary>
         /// <param name="format">The format to discover</param>
         /// <returns>The <see cref="IImageDecoder"/> if found otherwise null</returns>
-        internal IImageDecoder FindDecoder(IImageFormat format)
+        public IImageDecoder FindDecoder(IImageFormat format)
         {
             Guard.NotNull(format, nameof(format));
             if (this.mimeTypeDecoders.TryGetValue(format, out IImageDecoder decoder))
@@ -233,7 +216,7 @@ internal IImageDecoder FindDecoder(IImageFormat format)
         /// </summary>
         /// <param name="format">The format to discover</param>
         /// <returns>The <see cref="IImageEncoder"/> if found otherwise null</returns>
-        internal IImageEncoder FindEncoder(IImageFormat format)
+        public IImageEncoder FindEncoder(IImageFormat format)
         {
             Guard.NotNull(format, nameof(format));
             if (this.mimeTypeEncoders.TryGetValue(format, out IImageEncoder encoder))
@@ -244,6 +227,23 @@ internal IImageEncoder FindEncoder(IImageFormat format)
             return null;
         }
 
+        /// <summary>
+        /// Creates the default instance with the following <see cref="IConfigurationModule"/>s preregistered:
+        /// <para><see cref="PngConfigurationModule"/></para>
+        /// <para><see cref="JpegConfigurationModule"/></para>
+        /// <para><see cref="GifConfigurationModule"/></para>
+        /// <para><see cref="BmpConfigurationModule"/></para>
+        /// </summary>
+        /// <returns>The default configuration of <see cref="Configuration"/></returns>
+        internal static Configuration CreateDefaultInstance()
+        {
+            return new Configuration(
+                new PngConfigurationModule(),
+                new JpegConfigurationModule(),
+                new GifConfigurationModule(),
+                new BmpConfigurationModule());
+        }
+
         /// <summary>
         /// Sets the max header size.
         /// </summary>