diff --git a/src/ImageSharp/Configuration.cs b/src/ImageSharp/Configuration.cs
index 8d3811a97..d41e48678 100644
--- a/src/ImageSharp/Configuration.cs
+++ b/src/ImageSharp/Configuration.cs
@@ -83,21 +83,6 @@ namespace SixLabors.ImageSharp
         /// </summary>
         internal int MaxHeaderSize => this.ImageFormatsManager.MaxHeaderSize;
 
-        /// <summary>
-        /// Gets the currently registered <see cref="IImageFormatDetector"/>s.
-        /// </summary>
-        internal IEnumerable<IImageFormatDetector> FormatDetectors => this.ImageFormatsManager.FormatDetectors;
-
-        /// <summary>
-        /// Gets the currently registered <see cref="IImageDecoder"/>s.
-        /// </summary>
-        internal IEnumerable<KeyValuePair<IImageFormat, IImageDecoder>> ImageDecoders => this.ImageFormatsManager.ImageDecoders;
-
-        /// <summary>
-        /// Gets the currently registered <see cref="IImageEncoder"/>s.
-        /// </summary>
-        internal IEnumerable<KeyValuePair<IImageFormat, IImageEncoder>> ImageEncoders => this.ImageFormatsManager.ImageEncoders;
-
 #if !NETSTANDARD1_1
         /// <summary>
         /// Gets or sets the filesystem helper for accessing the local file system.
@@ -126,106 +111,18 @@ namespace SixLabors.ImageSharp
         /// <returns>A new configuration instance</returns>
         public Configuration ShallowCopy()
         {
-            Configuration cfg = new Configuration();
-
-            cfg.ParallelOptions = this.ParallelOptions;
-            cfg.ImageFormatsManager = this.ImageFormatsManager;
-            cfg.MemoryManager = this.MemoryManager;
-            cfg.ImageOperationsProvider = this.ImageOperationsProvider;
+            return new Configuration
+            {
+                ParallelOptions = this.ParallelOptions,
+                ImageFormatsManager = this.ImageFormatsManager,
+                MemoryManager = this.MemoryManager,
+                ImageOperationsProvider = this.ImageOperationsProvider,
+                ReadOrigin = this.ReadOrigin,
 
 #if !NETSTANDARD1_1
-            cfg.FileSystem = this.FileSystem;
+                FileSystem = this.FileSystem
 #endif
-
-            cfg.ReadOrigin = this.ReadOrigin;
-
-            return cfg;
-        }
-
-        /// <summary>
-        /// Registers a new format provider.
-        /// </summary>
-        /// <param name="format">The format to register as a known format.</param>
-        public void AddImageFormat(IImageFormat format)
-        {
-            this.ImageFormatsManager.AddImageFormat(format);
-        }
-
-        /// <summary>
-        /// For the specified file extensions type find the e <see cref="IImageFormat"/>.
-        /// </summary>
-        /// <param name="extension">The extension to discover</param>
-        /// <returns>The <see cref="IImageFormat"/> if found otherwise null</returns>
-        public IImageFormat FindFormatByFileExtension(string extension)
-        {
-            return this.ImageFormatsManager.FindFormatByFileExtension(extension);
-        }
-
-        /// <summary>
-        /// For the specified mime type find the <see cref="IImageFormat"/>.
-        /// </summary>
-        /// <param name="mimeType">The mime-type to discover</param>
-        /// <returns>The <see cref="IImageFormat"/> if found; otherwise null</returns>
-        public IImageFormat FindFormatByMimeType(string mimeType)
-        {
-            return this.ImageFormatsManager.FindFormatByMimeType(mimeType);
-        }
-
-        /// <summary>
-        /// Sets a specific image encoder as the encoder for a specific image format.
-        /// </summary>
-        /// <param name="imageFormat">The image format to register the encoder for.</param>
-        /// <param name="encoder">The encoder to use,</param>
-        public void SetEncoder(IImageFormat imageFormat, IImageEncoder encoder)
-        {
-            this.ImageFormatsManager.SetEncoder(imageFormat, encoder);
-        }
-
-        /// <summary>
-        /// Sets a specific image decoder as the decoder for a specific image format.
-        /// </summary>
-        /// <param name="imageFormat">The image format to register the encoder for.</param>
-        /// <param name="decoder">The decoder to use,</param>
-        public void SetDecoder(IImageFormat imageFormat, IImageDecoder decoder)
-        {
-            this.ImageFormatsManager.SetDecoder(imageFormat, decoder);
-        }
-
-        /// <summary>
-        /// Removes all the registered image format detectors.
-        /// </summary>
-        public void ClearImageFormatDetectors()
-        {
-            this.ImageFormatsManager.ClearImageFormatDetectors();
-        }
-
-        /// <summary>
-        /// Adds a new detector for detecting mime types.
-        /// </summary>
-        /// <param name="detector">The detector to add</param>
-        public void AddImageFormatDetector(IImageFormatDetector detector)
-        {
-            this.ImageFormatsManager.AddImageFormatDetector(detector);
-        }
-
-        /// <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>
-        public IImageDecoder FindDecoder(IImageFormat format)
-        {
-            return this.ImageFormatsManager.FindDecoder(format);
-        }
-
-        /// <summary>
-        /// For the specified mime type find the encoder.
-        /// </summary>
-        /// <param name="format">The format to discover</param>
-        /// <returns>The <see cref="IImageEncoder"/> if found otherwise null</returns>
-        public IImageEncoder FindEncoder(IImageFormat format)
-        {
-            return this.ImageFormatsManager.FindEncoder(format);
+            };
         }
 
         /// <summary>
diff --git a/src/ImageSharp/Formats/Bmp/BmpConfigurationModule.cs b/src/ImageSharp/Formats/Bmp/BmpConfigurationModule.cs
index b091467bf..956acc157 100644
--- a/src/ImageSharp/Formats/Bmp/BmpConfigurationModule.cs
+++ b/src/ImageSharp/Formats/Bmp/BmpConfigurationModule.cs
@@ -11,9 +11,9 @@ namespace SixLabors.ImageSharp.Formats.Bmp
         /// <inheritdoc/>
         public void Configure(Configuration config)
         {
-            config.SetEncoder(ImageFormats.Bmp, new BmpEncoder());
-            config.SetDecoder(ImageFormats.Bmp, new BmpDecoder());
-            config.AddImageFormatDetector(new BmpImageFormatDetector());
+            config.ImageFormatsManager.SetEncoder(ImageFormats.Bmp, new BmpEncoder());
+            config.ImageFormatsManager.SetDecoder(ImageFormats.Bmp, new BmpDecoder());
+            config.ImageFormatsManager.AddImageFormatDetector(new BmpImageFormatDetector());
         }
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Bmp/ImageExtensions.cs b/src/ImageSharp/Formats/Bmp/ImageExtensions.cs
index 935ce8f4a..35e168e27 100644
--- a/src/ImageSharp/Formats/Bmp/ImageExtensions.cs
+++ b/src/ImageSharp/Formats/Bmp/ImageExtensions.cs
@@ -36,6 +36,6 @@ namespace SixLabors.ImageSharp
         /// <exception cref="System.ArgumentNullException">Thrown if the stream is null.</exception>
         public static void SaveAsBmp<TPixel>(this Image<TPixel> source, Stream stream, BmpEncoder encoder)
             where TPixel : struct, IPixel<TPixel>
-                        => source.Save(stream, encoder ?? source.GetConfiguration().FindEncoder(ImageFormats.Bmp));
+                        => source.Save(stream, encoder ?? source.GetConfiguration().ImageFormatsManager.FindEncoder(ImageFormats.Bmp));
     }
 }
diff --git a/src/ImageSharp/Formats/Gif/GifConfigurationModule.cs b/src/ImageSharp/Formats/Gif/GifConfigurationModule.cs
index 4c42a833c..0bb62779e 100644
--- a/src/ImageSharp/Formats/Gif/GifConfigurationModule.cs
+++ b/src/ImageSharp/Formats/Gif/GifConfigurationModule.cs
@@ -11,10 +11,10 @@ namespace SixLabors.ImageSharp.Formats.Gif
         /// <inheritdoc/>
         public void Configure(Configuration config)
         {
-            config.SetEncoder(ImageFormats.Gif, new GifEncoder());
-            config.SetDecoder(ImageFormats.Gif, new GifDecoder());
+            config.ImageFormatsManager.SetEncoder(ImageFormats.Gif, new GifEncoder());
+            config.ImageFormatsManager.SetDecoder(ImageFormats.Gif, new GifDecoder());
 
-            config.AddImageFormatDetector(new GifImageFormatDetector());
+            config.ImageFormatsManager.AddImageFormatDetector(new GifImageFormatDetector());
         }
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Gif/ImageExtensions.cs b/src/ImageSharp/Formats/Gif/ImageExtensions.cs
index 939eb456e..78acadb4b 100644
--- a/src/ImageSharp/Formats/Gif/ImageExtensions.cs
+++ b/src/ImageSharp/Formats/Gif/ImageExtensions.cs
@@ -36,6 +36,6 @@ namespace SixLabors.ImageSharp
         /// <exception cref="System.ArgumentNullException">Thrown if the stream is null.</exception>
         public static void SaveAsGif<TPixel>(this Image<TPixel> source, Stream stream, GifEncoder encoder)
             where TPixel : struct, IPixel<TPixel>
-            => source.Save(stream, encoder ?? source.GetConfiguration().FindEncoder(ImageFormats.Gif));
+            => source.Save(stream, encoder ?? source.GetConfiguration().ImageFormatsManager.FindEncoder(ImageFormats.Gif));
     }
 }
diff --git a/src/ImageSharp/Formats/Jpeg/ImageExtensions.cs b/src/ImageSharp/Formats/Jpeg/ImageExtensions.cs
index 9cd7b3a8b..d3f95e40c 100644
--- a/src/ImageSharp/Formats/Jpeg/ImageExtensions.cs
+++ b/src/ImageSharp/Formats/Jpeg/ImageExtensions.cs
@@ -36,6 +36,6 @@ namespace SixLabors.ImageSharp
         /// <exception cref="System.ArgumentNullException">Thrown if the stream is null.</exception>
         public static void SaveAsJpeg<TPixel>(this Image<TPixel> source, Stream stream, JpegEncoder encoder)
             where TPixel : struct, IPixel<TPixel>
-            => source.Save(stream, encoder ?? source.GetConfiguration().FindEncoder(ImageFormats.Jpeg));
+            => source.Save(stream, encoder ?? source.GetConfiguration().ImageFormatsManager.FindEncoder(ImageFormats.Jpeg));
     }
 }
diff --git a/src/ImageSharp/Formats/Jpeg/JpegConfigurationModule.cs b/src/ImageSharp/Formats/Jpeg/JpegConfigurationModule.cs
index 1ab509339..23cef5927 100644
--- a/src/ImageSharp/Formats/Jpeg/JpegConfigurationModule.cs
+++ b/src/ImageSharp/Formats/Jpeg/JpegConfigurationModule.cs
@@ -11,10 +11,10 @@ namespace SixLabors.ImageSharp.Formats.Jpeg
         /// <inheritdoc/>
         public void Configure(Configuration config)
         {
-            config.SetEncoder(ImageFormats.Jpeg, new JpegEncoder());
-            config.SetDecoder(ImageFormats.Jpeg, new JpegDecoder());
+            config.ImageFormatsManager.SetEncoder(ImageFormats.Jpeg, new JpegEncoder());
+            config.ImageFormatsManager.SetDecoder(ImageFormats.Jpeg, new JpegDecoder());
 
-            config.AddImageFormatDetector(new JpegImageFormatDetector());
+            config.ImageFormatsManager.AddImageFormatDetector(new JpegImageFormatDetector());
         }
     }
 }
diff --git a/src/ImageSharp/Formats/Png/ImageExtensions.cs b/src/ImageSharp/Formats/Png/ImageExtensions.cs
index 10970fc16..f25d2bffe 100644
--- a/src/ImageSharp/Formats/Png/ImageExtensions.cs
+++ b/src/ImageSharp/Formats/Png/ImageExtensions.cs
@@ -35,6 +35,6 @@ namespace SixLabors.ImageSharp
         /// <exception cref="System.ArgumentNullException">Thrown if the stream is null.</exception>
         public static void SaveAsPng<TPixel>(this Image<TPixel> source, Stream stream, PngEncoder encoder)
             where TPixel : struct, IPixel<TPixel>
-            => source.Save(stream, encoder ?? source.GetConfiguration().FindEncoder(ImageFormats.Png));
+            => source.Save(stream, encoder ?? source.GetConfiguration().ImageFormatsManager.FindEncoder(ImageFormats.Png));
     }
 }
diff --git a/src/ImageSharp/Formats/Png/PngConfigurationModule.cs b/src/ImageSharp/Formats/Png/PngConfigurationModule.cs
index ab6f31d49..0036280a8 100644
--- a/src/ImageSharp/Formats/Png/PngConfigurationModule.cs
+++ b/src/ImageSharp/Formats/Png/PngConfigurationModule.cs
@@ -11,9 +11,9 @@ namespace SixLabors.ImageSharp.Formats.Png
         /// <inheritdoc/>
         public void Configure(Configuration config)
         {
-            config.SetEncoder(ImageFormats.Png, new PngEncoder());
-            config.SetDecoder(ImageFormats.Png, new PngDecoder());
-            config.AddImageFormatDetector(new PngImageFormatDetector());
+            config.ImageFormatsManager.SetEncoder(ImageFormats.Png, new PngEncoder());
+            config.ImageFormatsManager.SetDecoder(ImageFormats.Png, new PngDecoder());
+            config.ImageFormatsManager.AddImageFormatDetector(new PngImageFormatDetector());
         }
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Image/Image.Decode.cs b/src/ImageSharp/Image/Image.Decode.cs
index 72492a494..6b44c893b 100644
--- a/src/ImageSharp/Image/Image.Decode.cs
+++ b/src/ImageSharp/Image/Image.Decode.cs
@@ -34,7 +34,7 @@ namespace SixLabors.ImageSharp
                 long startPosition = stream.Position;
                 stream.Read(buffer.Array, 0, maxHeaderSize);
                 stream.Position = startPosition;
-                return config.FormatDetectors.Select(x => x.DetectFormat(buffer.Span)).LastOrDefault(x => x != null);
+                return config.ImageFormatsManager.FormatDetectors.Select(x => x.DetectFormat(buffer.Span)).LastOrDefault(x => x != null);
             }
         }
 
@@ -50,7 +50,7 @@ namespace SixLabors.ImageSharp
             format = InternalDetectFormat(stream, config);
             if (format != null)
             {
-                return config.FindDecoder(format);
+                return config.ImageFormatsManager.FindDecoder(format);
             }
 
             return null;
diff --git a/src/ImageSharp/Image/Image.FromStream.cs b/src/ImageSharp/Image/Image.FromStream.cs
index 4e294260a..9061c334d 100644
--- a/src/ImageSharp/Image/Image.FromStream.cs
+++ b/src/ImageSharp/Image/Image.FromStream.cs
@@ -186,7 +186,7 @@ namespace SixLabors.ImageSharp
             var stringBuilder = new StringBuilder();
             stringBuilder.AppendLine("Image cannot be loaded. Available decoders:");
 
-            foreach (KeyValuePair<IImageFormat, IImageDecoder> val in config.ImageDecoders)
+            foreach (KeyValuePair<IImageFormat, IImageDecoder> val in config.ImageFormatsManager.ImageDecoders)
             {
                 stringBuilder.AppendLine($" - {val.Key.Name} : {val.Value.GetType().Name}");
             }
diff --git a/src/ImageSharp/Image/ImageExtensions.cs b/src/ImageSharp/Image/ImageExtensions.cs
index c4de1c298..7d23d95d9 100644
--- a/src/ImageSharp/Image/ImageExtensions.cs
+++ b/src/ImageSharp/Image/ImageExtensions.cs
@@ -32,7 +32,7 @@ namespace SixLabors.ImageSharp
             Guard.NotNullOrEmpty(filePath, nameof(filePath));
 
             string ext = Path.GetExtension(filePath).Trim('.');
-            IImageFormat format = source.GetConfiguration().FindFormatByFileExtension(ext);
+            IImageFormat format = source.GetConfiguration().ImageFormatsManager.FindFormatByFileExtension(ext);
             if (format == null)
             {
                 var stringBuilder = new StringBuilder();
@@ -45,13 +45,13 @@ namespace SixLabors.ImageSharp
                 throw new NotSupportedException(stringBuilder.ToString());
             }
 
-            IImageEncoder encoder = source.GetConfiguration().FindEncoder(format);
+            IImageEncoder encoder = source.GetConfiguration().ImageFormatsManager.FindEncoder(format);
 
             if (encoder == null)
             {
                 var stringBuilder = new StringBuilder();
                 stringBuilder.AppendLine($"Can't find encoder for file extention '{ext}' using image format '{format.Name}'. Registered encoders include:");
-                foreach (KeyValuePair<IImageFormat, IImageEncoder> enc in source.GetConfiguration().ImageEncoders)
+                foreach (KeyValuePair<IImageFormat, IImageEncoder> enc in source.GetConfiguration().ImageFormatsManager.ImageEncoders)
                 {
                     stringBuilder.AppendLine($" - {enc.Key} : {enc.Value.GetType().Name}");
                 }
@@ -93,14 +93,14 @@ namespace SixLabors.ImageSharp
             where TPixel : struct, IPixel<TPixel>
         {
             Guard.NotNull(format, nameof(format));
-            IImageEncoder encoder = source.GetConfiguration().FindEncoder(format);
+            IImageEncoder encoder = source.GetConfiguration().ImageFormatsManager.FindEncoder(format);
 
             if (encoder == null)
             {
                 var stringBuilder = new StringBuilder();
                 stringBuilder.AppendLine("Can't find encoder for provided mime type. Available encoded:");
 
-                foreach (KeyValuePair<IImageFormat, IImageEncoder> val in source.GetConfiguration().ImageEncoders)
+                foreach (KeyValuePair<IImageFormat, IImageEncoder> val in source.GetConfiguration().ImageFormatsManager.ImageEncoders)
                 {
                     stringBuilder.AppendLine($" - {val.Key.Name} : {val.Value.GetType().Name}");
                 }
diff --git a/tests/ImageSharp.Tests/ConfigurationTests.cs b/tests/ImageSharp.Tests/ConfigurationTests.cs
index d38556fa9..cf348569c 100644
--- a/tests/ImageSharp.Tests/ConfigurationTests.cs
+++ b/tests/ImageSharp.Tests/ConfigurationTests.cs
@@ -34,14 +34,7 @@ namespace SixLabors.ImageSharp.Tests
         {
             Assert.IsType<LocalFileSystem>(this.DefaultConfiguration.FileSystem);
             Assert.IsType<LocalFileSystem>(this.ConfigurationEmpty.FileSystem);
-        }
-
-        [Fact]
-        public void IfAutoloadWellknwonFormatesIsTrueAllFormateAreLoaded()
-        {
-            Assert.Equal(4, this.DefaultConfiguration.ImageEncoders.Count());
-            Assert.Equal(4, this.DefaultConfiguration.ImageDecoders.Count());
-        }
+        }        
 
         /// <summary>
         /// Test that the default configuration is not null.
@@ -80,80 +73,6 @@ namespace SixLabors.ImageSharp.Tests
             Assert.True(Configuration.Default.ParallelOptions.MaxDegreeOfParallelism == Environment.ProcessorCount);
         }
 
-        [Fact]
-        public void AddImageFormatDetectorNullthrows()
-        {
-            Assert.Throws<ArgumentNullException>(() =>
-            {
-                this.DefaultConfiguration.AddImageFormatDetector(null);
-            });
-        }
-
-        [Fact]
-        public void RegisterNullMimeTypeEncoder()
-        {
-            Assert.Throws<ArgumentNullException>(() =>
-            {
-                this.DefaultConfiguration.SetEncoder(null, new Mock<IImageEncoder>().Object);
-            });
-            Assert.Throws<ArgumentNullException>(() =>
-            {
-                this.DefaultConfiguration.SetEncoder(ImageFormats.Bmp, null);
-            });
-            Assert.Throws<ArgumentNullException>(() =>
-            {
-                this.DefaultConfiguration.SetEncoder(null, null);
-            });
-        }
-
-        [Fact]
-        public void RegisterNullSetDecoder()
-        {
-            Assert.Throws<ArgumentNullException>(() =>
-            {
-                this.DefaultConfiguration.SetDecoder(null, new Mock<IImageDecoder>().Object);
-            });
-            Assert.Throws<ArgumentNullException>(() =>
-            {
-                this.DefaultConfiguration.SetDecoder(ImageFormats.Bmp, null);
-            });
-            Assert.Throws<ArgumentNullException>(() =>
-            {
-                this.DefaultConfiguration.SetDecoder(null, null);
-            });
-        }
-
-        [Fact]
-        public void RegisterMimeTypeEncoderReplacesLast()
-        {
-            IImageEncoder encoder1 = new Mock<IImageEncoder>().Object;
-            this.ConfigurationEmpty.SetEncoder(TestFormat.GlobalTestFormat, encoder1);
-            IImageEncoder found = this.ConfigurationEmpty.FindEncoder(TestFormat.GlobalTestFormat);
-            Assert.Equal(encoder1, found);
-
-            IImageEncoder encoder2 = new Mock<IImageEncoder>().Object;
-            this.ConfigurationEmpty.SetEncoder(TestFormat.GlobalTestFormat, encoder2);
-            IImageEncoder found2 = this.ConfigurationEmpty.FindEncoder(TestFormat.GlobalTestFormat);
-            Assert.Equal(encoder2, found2);
-            Assert.NotEqual(found, found2);
-        }
-
-        [Fact]
-        public void RegisterMimeTypeDecoderReplacesLast()
-        {
-            IImageDecoder decoder1 = new Mock<IImageDecoder>().Object;
-            this.ConfigurationEmpty.SetDecoder(TestFormat.GlobalTestFormat, decoder1);
-            IImageDecoder found = this.ConfigurationEmpty.FindDecoder(TestFormat.GlobalTestFormat);
-            Assert.Equal(decoder1, found);
-
-            IImageDecoder decoder2 = new Mock<IImageDecoder>().Object;
-            this.ConfigurationEmpty.SetDecoder(TestFormat.GlobalTestFormat, decoder2);
-            IImageDecoder found2 = this.ConfigurationEmpty.FindDecoder(TestFormat.GlobalTestFormat);
-            Assert.Equal(decoder2, found2);
-            Assert.NotEqual(found, found2);
-        }
-
-
         [Fact]
         public void ConstructorCallConfigureOnFormatProvider()
         {
diff --git a/tests/ImageSharp.Tests/Image/ImageDiscoverMimeType.cs b/tests/ImageSharp.Tests/Image/ImageDiscoverMimeType.cs
index f19fa1990..1a2275062 100644
--- a/tests/ImageSharp.Tests/Image/ImageDiscoverMimeType.cs
+++ b/tests/ImageSharp.Tests/Image/ImageDiscoverMimeType.cs
@@ -40,7 +40,7 @@ namespace SixLabors.ImageSharp.Tests
                 FileSystem = this.fileSystem.Object
             };
 
-            this.LocalConfiguration.AddImageFormatDetector(this.localMimeTypeDetector);
+            this.LocalConfiguration.ImageFormatsManager.AddImageFormatDetector(this.localMimeTypeDetector);
 
             TestFormat.RegisterGlobalTestFormat();
             this.Marker = Guid.NewGuid().ToByteArray();
diff --git a/tests/ImageSharp.Tests/Image/ImageLoadTests.cs b/tests/ImageSharp.Tests/Image/ImageLoadTests.cs
index de18714e2..97274e98b 100644
--- a/tests/ImageSharp.Tests/Image/ImageLoadTests.cs
+++ b/tests/ImageSharp.Tests/Image/ImageLoadTests.cs
@@ -54,8 +54,8 @@ namespace SixLabors.ImageSharp.Tests
             {
                 FileSystem = this.fileSystem.Object
             };
-            this.LocalConfiguration.AddImageFormatDetector(this.localMimeTypeDetector);
-            this.LocalConfiguration.SetDecoder(this.localImageFormatMock.Object, this.localDecoder.Object);
+            this.LocalConfiguration.ImageFormatsManager.AddImageFormatDetector(this.localMimeTypeDetector);
+            this.LocalConfiguration.ImageFormatsManager.SetDecoder(this.localImageFormatMock.Object, this.localDecoder.Object);
 
             TestFormat.RegisterGlobalTestFormat();
             this.Marker = Guid.NewGuid().ToByteArray();
diff --git a/tests/ImageSharp.Tests/Image/ImageSaveTests.cs b/tests/ImageSharp.Tests/Image/ImageSaveTests.cs
index 7f6e3b7da..028313e63 100644
--- a/tests/ImageSharp.Tests/Image/ImageSaveTests.cs
+++ b/tests/ImageSharp.Tests/Image/ImageSaveTests.cs
@@ -42,8 +42,8 @@ namespace SixLabors.ImageSharp.Tests
             {
                 FileSystem = this.fileSystem.Object
             };
-            config.AddImageFormatDetector(this.localMimeTypeDetector);
-            config.SetEncoder(this.localImageFormat.Object, this.encoder.Object);
+            config.ImageFormatsManager.AddImageFormatDetector(this.localMimeTypeDetector);
+            config.ImageFormatsManager.SetEncoder(this.localImageFormat.Object, this.encoder.Object);
             this.Image = new Image<Rgba32>(config, 1, 1);
         }
 
diff --git a/tests/ImageSharp.Tests/TestFormat.cs b/tests/ImageSharp.Tests/TestFormat.cs
index 078b708df..445ace981 100644
--- a/tests/ImageSharp.Tests/TestFormat.cs
+++ b/tests/ImageSharp.Tests/TestFormat.cs
@@ -116,9 +116,9 @@ namespace SixLabors.ImageSharp.Tests
 
         public void Configure(Configuration host)
         {
-            host.AddImageFormatDetector(new TestHeader(this));
-            host.SetEncoder(this, new TestEncoder(this));
-            host.SetDecoder(this, new TestDecoder(this));
+            host.ImageFormatsManager.AddImageFormatDetector(new TestHeader(this));
+            host.ImageFormatsManager.SetEncoder(this, new TestEncoder(this));
+            host.ImageFormatsManager.SetDecoder(this, new TestDecoder(this));
         }
 
         public struct DecodeOperation
diff --git a/tests/ImageSharp.Tests/TestUtilities/TestEnvironment.Formats.cs b/tests/ImageSharp.Tests/TestUtilities/TestEnvironment.Formats.cs
index 089fed6b0..fa9497a8f 100644
--- a/tests/ImageSharp.Tests/TestUtilities/TestEnvironment.Formats.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/TestEnvironment.Formats.cs
@@ -21,20 +21,20 @@ namespace SixLabors.ImageSharp.Tests
         internal static IImageDecoder GetReferenceDecoder(string filePath)
         {
             IImageFormat format = GetImageFormat(filePath);
-            return Configuration.FindDecoder(format);
+            return Configuration.ImageFormatsManager.FindDecoder(format);
         }
 
         internal static IImageEncoder GetReferenceEncoder(string filePath)
         {
             IImageFormat format = GetImageFormat(filePath);
-            return Configuration.FindEncoder(format);
+            return Configuration.ImageFormatsManager.FindEncoder(format);
         }
 
         internal static IImageFormat GetImageFormat(string filePath)
         {
             string extension = Path.GetExtension(filePath).ToLower();
             if (extension[0] == '.') extension = extension.Substring(1);
-            IImageFormat format = Configuration.FindFormatByFileExtension(extension);
+            IImageFormat format = Configuration.ImageFormatsManager.FindFormatByFileExtension(extension);
             return format;
         }
 
@@ -45,9 +45,9 @@ namespace SixLabors.ImageSharp.Tests
             IImageEncoder encoder,
             IImageFormatDetector detector)
         {
-            cfg.SetDecoder(imageFormat, decoder);
-            cfg.SetEncoder(imageFormat, encoder);
-            cfg.AddImageFormatDetector(detector);
+            cfg.ImageFormatsManager.SetDecoder(imageFormat, decoder);
+            cfg.ImageFormatsManager.SetEncoder(imageFormat, encoder);
+            cfg.ImageFormatsManager.AddImageFormatDetector(detector);
         }
 
         private static Configuration CreateDefaultConfiguration()
diff --git a/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs b/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs
index 6014e2533..f03f9db09 100644
--- a/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs
@@ -360,7 +360,7 @@ namespace SixLabors.ImageSharp.Tests
 
             IImageDecoder referenceDecoder = TestEnvironment.GetReferenceDecoder(path);
             IImageFormat format = TestEnvironment.GetImageFormat(path);
-            IImageDecoder defaultDecoder = Configuration.Default.FindDecoder(format);
+            IImageDecoder defaultDecoder = Configuration.Default.ImageFormatsManager.FindDecoder(format);
 
             //if (referenceDecoder.GetType() == defaultDecoder.GetType())
             //{