diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/JsonResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/JsonResult.cs
index bf7afa4b91..f3ccae757c 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/JsonResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/JsonResult.cs
@@ -7,6 +7,7 @@
 using System.Threading.Tasks;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;
+using Microsoft.Framework.OptionsModel;
 using Microsoft.Net.Http.Headers;
 
 namespace Microsoft.AspNet.Mvc
@@ -115,7 +116,8 @@ private IOutputFormatter SelectFormatter(ObjectResult objectResult, OutputFormat
                     .ActionContext
                     .HttpContext
                     .RequestServices
-                    .GetRequiredService<IOutputFormattersProvider>()
+                    .GetRequiredService<IOptions<MvcOptions>>()
+                    .Options
                     .OutputFormatters
                     .OfType<IJsonOutputFormatter>()
                     .ToArray();
diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/ObjectResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/ObjectResult.cs
index fabce23584..135f94161d 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/ObjectResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/ObjectResult.cs
@@ -273,10 +273,12 @@ private IEnumerable<IOutputFormatter> GetDefaultFormatters(ActionContext context
             IEnumerable<IOutputFormatter> formatters = null;
             if (Formatters == null || Formatters.Count == 0)
             {
-                formatters = context.HttpContext
-                                    .RequestServices
-                                    .GetRequiredService<IOutputFormattersProvider>()
-                                    .OutputFormatters;
+                formatters = context
+                    .HttpContext
+                    .RequestServices
+                    .GetRequiredService<IOptions<MvcOptions>>()
+                    .Options
+                    .OutputFormatters;
             }
             else
             {
diff --git a/src/Microsoft.AspNet.Mvc.Core/ControllerActionInvoker.cs b/src/Microsoft.AspNet.Mvc.Core/ControllerActionInvoker.cs
index 391b8ff3c0..efa26b64b4 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ControllerActionInvoker.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ControllerActionInvoker.cs
@@ -23,20 +23,20 @@ public ControllerActionInvoker(
             [NotNull] IReadOnlyList<IFilterProvider> filterProviders,
             [NotNull] IControllerFactory controllerFactory,
             [NotNull] ControllerActionDescriptor descriptor,
-            [NotNull] IInputFormattersProvider inputFormatterProvider,
+            [NotNull] IReadOnlyList<IInputFormatter> inputFormatters,
             [NotNull] IControllerActionArgumentBinder controllerActionArgumentBinder,
-            [NotNull] IModelBinderProvider modelBinderProvider,
-            [NotNull] IModelValidatorProviderProvider modelValidatorProviderProvider,
-            [NotNull] IValueProviderFactoryProvider valueProviderFactoryProvider,
+            [NotNull] IReadOnlyList<IModelBinder> modelBinders,
+            [NotNull] IReadOnlyList<IModelValidatorProvider> modelValidatorProviders,
+            [NotNull] IReadOnlyList<IValueProviderFactory> valueProviderFactories,
             [NotNull] IScopedInstance<ActionBindingContext> actionBindingContextAccessor,
             [NotNull] ITempDataDictionary tempData)
             : base(
                   actionContext, 
                   filterProviders,
-                  inputFormatterProvider, 
-                  modelBinderProvider, 
-                  modelValidatorProviderProvider, 
-                  valueProviderFactoryProvider,
+                  inputFormatters, 
+                  modelBinders, 
+                  modelValidatorProviders, 
+                  valueProviderFactories,
                   actionBindingContextAccessor)
         {
             _descriptor = descriptor;
diff --git a/src/Microsoft.AspNet.Mvc.Core/ControllerActionInvokerProvider.cs b/src/Microsoft.AspNet.Mvc.Core/ControllerActionInvokerProvider.cs
index 2e2497808d..d99a8881ff 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ControllerActionInvokerProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ControllerActionInvokerProvider.cs
@@ -6,6 +6,7 @@
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 using Microsoft.Framework.Internal;
+using Microsoft.Framework.OptionsModel;
 
 namespace Microsoft.AspNet.Mvc.Core
 {
@@ -14,31 +15,28 @@ public class ControllerActionInvokerProvider : IActionInvokerProvider
         private readonly IControllerActionArgumentBinder _argumentBinder;
         private readonly IControllerFactory _controllerFactory;
         private readonly IFilterProvider[] _filterProviders;
-        private readonly IInputFormattersProvider _inputFormattersProvider;
-        private readonly IModelBinderProvider _modelBinderProvider;
-        private readonly IModelValidatorProviderProvider _modelValidationProviderProvider;
-        private readonly IValueProviderFactoryProvider _valueProviderFactoryProvider;
+        private readonly IReadOnlyList<IInputFormatter> _inputFormatters;
+        private readonly IReadOnlyList<IModelBinder> _modelBinders;
+        private readonly IReadOnlyList<IModelValidatorProvider> _modelValidatorProviders;
+        private readonly IReadOnlyList<IValueProviderFactory> _valueProviderFactories;
         private readonly IScopedInstance<ActionBindingContext> _actionBindingContextAccessor;
         private readonly ITempDataDictionary _tempData;
 
         public ControllerActionInvokerProvider(
             IControllerFactory controllerFactory,
-            IInputFormattersProvider inputFormattersProvider,
             IEnumerable<IFilterProvider> filterProviders,
             IControllerActionArgumentBinder argumentBinder,
-            IModelBinderProvider modelBinderProvider,
-            IModelValidatorProviderProvider modelValidationProviderProvider,
-            IValueProviderFactoryProvider valueProviderFactoryProvider,
+            IOptions<MvcOptions> optionsAccessor,
             IScopedInstance<ActionBindingContext> actionBindingContextAccessor,
             ITempDataDictionary tempData)
         {
             _controllerFactory = controllerFactory;
-            _inputFormattersProvider = inputFormattersProvider;
             _filterProviders = filterProviders.OrderBy(item => item.Order).ToArray();
             _argumentBinder = argumentBinder;
-            _modelBinderProvider = modelBinderProvider;
-            _modelValidationProviderProvider = modelValidationProviderProvider;
-            _valueProviderFactoryProvider = valueProviderFactoryProvider;
+            _inputFormatters = optionsAccessor.Options.InputFormatters.ToArray();
+            _modelBinders = optionsAccessor.Options.ModelBinders.ToArray();
+            _modelValidatorProviders = optionsAccessor.Options.ModelValidatorProviders.ToArray();
+            _valueProviderFactories = optionsAccessor.Options.ValueProviderFactories.ToArray();
             _actionBindingContextAccessor = actionBindingContextAccessor;
             _tempData = tempData;
         }
@@ -60,11 +58,11 @@ public void OnProvidersExecuting([NotNull] ActionInvokerProviderContext context)
                                     _filterProviders,
                                     _controllerFactory,
                                     actionDescriptor,
-                                    _inputFormattersProvider,
+                                    _inputFormatters,
                                     _argumentBinder,
-                                    _modelBinderProvider,
-                                    _modelValidationProviderProvider,
-                                    _valueProviderFactoryProvider,
+                                    _modelBinders,
+                                    _modelValidatorProviders,
+                                    _valueProviderFactories,
                                     _actionBindingContextAccessor,
                                     _tempData);
             }
diff --git a/src/Microsoft.AspNet.Mvc.Core/DefaultControllerActionArgumentBinder.cs b/src/Microsoft.AspNet.Mvc.Core/DefaultControllerActionArgumentBinder.cs
index fe58ab5523..93b3b51743 100644
--- a/src/Microsoft.AspNet.Mvc.Core/DefaultControllerActionArgumentBinder.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/DefaultControllerActionArgumentBinder.cs
@@ -4,11 +4,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.AspNet.Mvc.ModelBinding;
-using Microsoft.AspNet.Mvc.ModelBinding.Metadata;
 using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 using Microsoft.Framework.Internal;
 using Microsoft.Framework.OptionsModel;
@@ -37,7 +35,7 @@ public DefaultControllerActionArgumentBinder(
 
         public async Task<IDictionary<string, object>> BindActionArgumentsAsync(
             ActionContext actionContext,
-            ActionBindingContext actionBindingContext, 
+            ActionBindingContext actionBindingContext,
             object controller)
         {
             var actionDescriptor = actionContext.ActionDescriptor as ControllerActionDescriptor;
@@ -66,7 +64,7 @@ await PopulateArgumentsAsync(
                 actionArguments,
                 actionDescriptor.Parameters);
             return actionArguments;
-        }   
+        }
 
         private void ActivateProperties(object controller, Type containerType, Dictionary<string, object> properties)
         {
diff --git a/src/Microsoft.AspNet.Mvc.Core/Description/DefaultApiDescriptionProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Description/DefaultApiDescriptionProvider.cs
index 31139637fa..852c2b87f8 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Description/DefaultApiDescriptionProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Description/DefaultApiDescriptionProvider.cs
@@ -11,6 +11,7 @@
 using Microsoft.AspNet.Routing;
 using Microsoft.AspNet.Routing.Template;
 using Microsoft.Framework.Internal;
+using Microsoft.Framework.OptionsModel;
 using Microsoft.Net.Http.Headers;
 
 namespace Microsoft.AspNet.Mvc.Description
@@ -21,21 +22,23 @@ namespace Microsoft.AspNet.Mvc.Description
     /// </summary>
     public class DefaultApiDescriptionProvider : IApiDescriptionProvider
     {
-        private readonly IOutputFormattersProvider _formattersProvider;
+        private readonly IList<IOutputFormatter> _outputFormatters;
         private readonly IModelMetadataProvider _modelMetadataProvider;
         private readonly IInlineConstraintResolver _constraintResolver;
 
         /// <summary>
         /// Creates a new instance of <see cref="DefaultApiDescriptionProvider"/>.
         /// </summary>
-        /// <param name="formattersProvider">The <see cref="IOutputFormattersProvider"/>.</param>
+        /// <param name="optionsAccessor">The accessor for <see cref="MvcOptions"/>.</param>
+        /// <param name="constraintResolver">The <see cref="IInlineConstraintResolver"/> used for resolving inline
+        /// constraints.</param>
         /// <param name="modelMetadataProvider">The <see cref="IModelMetadataProvider"/>.</param>
         public DefaultApiDescriptionProvider(
-            IOutputFormattersProvider formattersProvider,
+            IOptions<MvcOptions> optionsAccessor,
             IInlineConstraintResolver constraintResolver,
             IModelMetadataProvider modelMetadataProvider)
         {
-            _formattersProvider = formattersProvider;
+            _outputFormatters = optionsAccessor.Options.OutputFormatters;
             _constraintResolver = constraintResolver;
             _modelMetadataProvider = modelMetadataProvider;
         }
@@ -316,10 +319,9 @@ private IReadOnlyList<ApiResponseFormat> GetResponseFormats(
                 contentTypes.Add(null);
             }
 
-            var formatters = _formattersProvider.OutputFormatters;
             foreach (var contentType in contentTypes)
             {
-                foreach (var formatter in formatters)
+                foreach (var formatter in _outputFormatters)
                 {
                     var responseFormatMetadataProvider = formatter as IApiResponseFormatMetadataProvider;
                     if (responseFormatMetadataProvider != null)
diff --git a/src/Microsoft.AspNet.Mvc.Core/FilterActionInvoker.cs b/src/Microsoft.AspNet.Mvc.Core/FilterActionInvoker.cs
index de38bde056..1f01eb1d14 100644
--- a/src/Microsoft.AspNet.Mvc.Core/FilterActionInvoker.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/FilterActionInvoker.cs
@@ -16,10 +16,11 @@ namespace Microsoft.AspNet.Mvc.Core
     public abstract class FilterActionInvoker : IActionInvoker
     {
         private readonly IReadOnlyList<IFilterProvider> _filterProviders;
-        private readonly IInputFormattersProvider _inputFormatterProvider;
-        private readonly IModelBinderProvider _modelBinderProvider;
-        private readonly IModelValidatorProviderProvider _modelValidatorProviderProvider;
-        private readonly IValueProviderFactoryProvider _valueProviderFactoryProvider;
+        private readonly IReadOnlyList<IInputFormatter> _inputFormatters;
+        private readonly IReadOnlyList<IModelBinder> _modelBinders;
+        private readonly IReadOnlyList<IModelValidatorProvider> _modelValidatorProviders;
+        private readonly IReadOnlyList<IValueProviderFactory> _valueProviderFactories;
+
         private readonly IScopedInstance<ActionBindingContext> _actionBindingContextAccessor;
 
         private IFilter[] _filters;
@@ -41,19 +42,19 @@ public abstract class FilterActionInvoker : IActionInvoker
         public FilterActionInvoker(
             [NotNull] ActionContext actionContext,
             [NotNull] IReadOnlyList<IFilterProvider> filterProviders,
-            [NotNull] IInputFormattersProvider inputFormatterProvider,
-            [NotNull] IModelBinderProvider modelBinderProvider,
-            [NotNull] IModelValidatorProviderProvider modelValidatorProviderProvider,
-            [NotNull] IValueProviderFactoryProvider valueProviderFactoryProvider,
+            [NotNull] IReadOnlyList<IInputFormatter> inputFormatters,
+            [NotNull] IReadOnlyList<IModelBinder> modelBinders,
+            [NotNull] IReadOnlyList<IModelValidatorProvider> modelValidatorProviders,
+            [NotNull] IReadOnlyList<IValueProviderFactory> valueProviderFactories,
             [NotNull] IScopedInstance<ActionBindingContext> actionBindingContextAccessor)
         {
             ActionContext = actionContext;
 
             _filterProviders = filterProviders;
-            _inputFormatterProvider = inputFormatterProvider;
-            _modelBinderProvider = modelBinderProvider;
-            _modelValidatorProviderProvider = modelValidatorProviderProvider;
-            _valueProviderFactoryProvider = valueProviderFactoryProvider;
+            _inputFormatters = inputFormatters;
+            _modelBinders = modelBinders;
+            _modelValidatorProviders = modelValidatorProviders;
+            _valueProviderFactories = valueProviderFactories;
             _actionBindingContextAccessor = actionBindingContextAccessor;
         }
 
@@ -206,14 +207,10 @@ private async Task InvokeAllResourceFiltersAsync()
 
             var context = new ResourceExecutingContext(ActionContext, _filters);
 
-            context.InputFormatters = new List<IInputFormatter>(_inputFormatterProvider.InputFormatters);
-            context.ModelBinders = new List<IModelBinder>(_modelBinderProvider.ModelBinders);
-
-            context.ValidatorProviders = new List<IModelValidatorProvider>(
-                _modelValidatorProviderProvider.ModelValidatorProviders);
-
-            context.ValueProviderFactories = new List<IValueProviderFactory>(
-                _valueProviderFactoryProvider.ValueProviderFactories);
+            context.InputFormatters = new List<IInputFormatter>(_inputFormatters);
+            context.ModelBinders = new List<IModelBinder>(_modelBinders);
+            context.ValidatorProviders = new List<IModelValidatorProvider>(_modelValidatorProviders);
+            context.ValueProviderFactories = new List<IValueProviderFactory>(_valueProviderFactories);
 
             _resourceExecutingContext = context;
             await InvokeResourceFilterAsync();
diff --git a/src/Microsoft.AspNet.Mvc.Core/Formatters/HttpNoContentOutputFormatter.cs b/src/Microsoft.AspNet.Mvc.Core/Formatters/HttpNoContentOutputFormatter.cs
index 4b9f752f2a..5e0f2a52da 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Formatters/HttpNoContentOutputFormatter.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Formatters/HttpNoContentOutputFormatter.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNet.WebUtilities;
 using Microsoft.Net.Http.Headers;
diff --git a/src/Microsoft.AspNet.Mvc.Core/Formatters/HttpNotAcceptableOutputFormatter.cs b/src/Microsoft.AspNet.Mvc.Core/Formatters/HttpNotAcceptableOutputFormatter.cs
index 298f6f2516..fda0195214 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Formatters/HttpNotAcceptableOutputFormatter.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Formatters/HttpNotAcceptableOutputFormatter.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNet.WebUtilities;
 using Microsoft.Net.Http.Headers;
diff --git a/src/Microsoft.AspNet.Mvc.Core/Formatters/IJsonOutputFormatter.cs b/src/Microsoft.AspNet.Mvc.Core/Formatters/IJsonOutputFormatter.cs
index cc07f4c437..10516814c8 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Formatters/IJsonOutputFormatter.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Formatters/IJsonOutputFormatter.cs
@@ -8,7 +8,7 @@ namespace Microsoft.AspNet.Mvc
     /// </summary>
     /// <remarks>
     /// The <see cref="JsonResult"/> class filter the collection of
-    /// <see cref="IOutputFormattersProvider.OutputFormatters"/> and use only those which implement
+    /// <see cref="MvcOptions.OutputFormatters"/> and use only those which implement
     /// <see cref="IJsonOutputFormatter"/>.
     ///
     /// To create a custom formatter that can be used by <see cref="JsonResult"/>, derive from
diff --git a/src/Microsoft.AspNet.Mvc.Core/ModelBinders/BodyModelBinder.cs b/src/Microsoft.AspNet.Mvc.Core/ModelBinders/BodyModelBinder.cs
index 0d9d7aa7da..fdb1cf6c78 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ModelBinders/BodyModelBinder.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ModelBinders/BodyModelBinder.cs
@@ -6,8 +6,6 @@
 using System.Reflection;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Mvc.Core;
-using Microsoft.AspNet.Mvc.ModelBinding;
-using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;
 
@@ -19,39 +17,25 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
     /// </summary>
     public class BodyModelBinder : BindingSourceModelBinder
     {
-        private readonly ActionContext _actionContext;
-        private readonly IScopedInstance<ActionBindingContext> _bindingContext;
-        private readonly IInputFormatterSelector _formatterSelector;
-        private readonly IValidationExcludeFiltersProvider _bodyValidationExcludeFiltersProvider;
-
         /// <summary>
         /// Creates a new <see cref="BodyModelBinder"/>.
         /// </summary>
-        /// <param name="context">An accessor to the <see cref="ActionContext"/>.</param>
-        /// <param name="bindingContext">An accessor to the <see cref="ActionBindingContext"/>.</param>
-        /// <param name="selector">The <see cref="IInputFormatterSelector"/>.</param>
-        /// <param name="bodyValidationExcludeFiltersProvider">
-        /// The <see cref="IValidationExcludeFiltersProvider"/>.
-        /// </param>
-        public BodyModelBinder([NotNull] IScopedInstance<ActionContext> context,
-                               [NotNull] IScopedInstance<ActionBindingContext> bindingContext,
-                               [NotNull] IInputFormatterSelector selector,
-                               [NotNull] IValidationExcludeFiltersProvider bodyValidationExcludeFiltersProvider)
+        public BodyModelBinder()
             : base(BindingSource.Body)
         {
-            _actionContext = context.Value;
-            _bindingContext = bindingContext;
-            _formatterSelector = selector;
-            _bodyValidationExcludeFiltersProvider = bodyValidationExcludeFiltersProvider;
         }
 
         /// <inheritdoc />
         protected async override Task<ModelBindingResult> BindModelCoreAsync([NotNull] ModelBindingContext bindingContext)
         {
-            var formatters = _bindingContext.Value.InputFormatters;
+            var requestServices = bindingContext.OperationBindingContext.HttpContext.RequestServices;
+
+            var formatterSelector = requestServices.GetRequiredService<IInputFormatterSelector>();
+            var actionContext = requestServices.GetRequiredService<IScopedInstance<ActionContext>>().Value;
+            var formatters = requestServices.GetRequiredService<IScopedInstance<ActionBindingContext>>().Value.InputFormatters;
 
-            var formatterContext = new InputFormatterContext(_actionContext, bindingContext.ModelType);
-            var formatter = _formatterSelector.SelectFormatter(formatters.ToList(), formatterContext);
+            var formatterContext = new InputFormatterContext(actionContext, bindingContext.ModelType);
+            var formatter = formatterSelector.SelectFormatter(formatters.ToList(), formatterContext);
 
             if (formatter == null)
             {
diff --git a/src/Microsoft.AspNet.Mvc.Core/MvcOptions.cs b/src/Microsoft.AspNet.Mvc.Core/MvcOptions.cs
index 86a4a7f8c4..19f1453b35 100644
--- a/src/Microsoft.AspNet.Mvc.Core/MvcOptions.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/MvcOptions.cs
@@ -5,9 +5,9 @@
 using System.Collections.Generic;
 using Microsoft.AspNet.Mvc.ApplicationModels;
 using Microsoft.AspNet.Mvc.Core;
-using Microsoft.AspNet.Mvc.OptionDescriptors;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.ModelBinding.Metadata;
+using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 
 namespace Microsoft.AspNet.Mvc
 {
@@ -22,16 +22,16 @@ public class MvcOptions
         public MvcOptions()
         {
             Conventions = new List<IApplicationModelConvention>();
-            ModelBinders = new List<ModelBinderDescriptor>();
+            ModelBinders = new List<IModelBinder>();
             ViewEngines = new List<ViewEngineDescriptor>();
-            ValueProviderFactories = new List<ValueProviderFactoryDescriptor>();
-            OutputFormatters = new List<OutputFormatterDescriptor>();
-            InputFormatters = new List<InputFormatterDescriptor>();
+            ValueProviderFactories = new List<IValueProviderFactory>();
+            OutputFormatters = new List<IOutputFormatter>();
+            InputFormatters = new List<IInputFormatter>();
             Filters = new List<IFilter>();
             FormatterMappings = new FormatterMappings();
-            ValidationExcludeFilters = new List<ExcludeValidationDescriptor>();
+            ValidationExcludeFilters = new List<IExcludeTypeValidationFilter>();
             ModelMetadataDetailsProviders = new List<IMetadataDetailsProvider>();
-            ModelValidatorProviders = new List<ModelValidatorProviderDescriptor>();
+            ModelValidatorProviders = new List<IModelValidatorProvider>();
             CacheProfiles = new Dictionary<string, CacheProfile>(StringComparer.OrdinalIgnoreCase);
         }
 
@@ -68,25 +68,23 @@ public AntiForgeryOptions AntiForgeryOptions
         /// Gets a list of <see cref="IFilter"/> which are used to construct filters that
         /// apply to all actions.
         /// </summary>
-        public ICollection<IFilter> Filters { get; private set; }
+        public ICollection<IFilter> Filters { get; }
 
         /// <summary>
-        /// Gets a list of the <see cref="OutputFormatterDescriptor" /> which are used to construct
-        /// a list of <see cref="IOutputFormatter"/> by <see cref="IOutputFormattersProvider"/>.
+        /// Gets a list of <see cref="IOutputFormatter"/>s that are used by this application.
         /// </summary>
-        public IList<OutputFormatterDescriptor> OutputFormatters { get; }
+        public IList<IOutputFormatter> OutputFormatters { get; }
 
         /// <summary>
-        /// Gets a list of the <see cref="InputFormatterDescriptor" /> which are used to construct
-        /// a list of <see cref="IInputFormatter"/> by <see cref="IInputFormattersProvider"/>.
+        /// Gets a list of <see cref="IInputFormatter"/>s that are used by this application.
         /// </summary>
-        public IList<InputFormatterDescriptor> InputFormatters { get; }
+        public IList<IInputFormatter> InputFormatters { get; }
 
         /// <summary>
-        /// Gets a list of <see cref="ExcludeValidationDescriptor"/> which are used to construct a list
-        /// of exclude filters by <see cref="ModelBinding.Validation.IValidationExcludeFiltersProvider"/>.
+        /// Gets a list of <see cref="IExcludeTypeValidationFilter"/>s that are used by this application.
         /// </summary>
-        public IList<ExcludeValidationDescriptor> ValidationExcludeFilters { get; }
+        public IList<IExcludeTypeValidationFilter> ValidationExcludeFilters { get; }
+            = new List<IExcludeTypeValidationFilter>();
 
         /// <summary>
         /// Gets or sets the maximum number of validation errors that are allowed by this application before further
@@ -107,17 +105,14 @@ public int MaxModelValidationErrors
         }
 
         /// <summary>
-        /// Get a list of the <see cref="ModelBinderDescriptor" /> used by the
-        /// Gets a list of the <see cref="ModelBinderDescriptor" /> used by the
-        /// <see cref="ModelBinding.CompositeModelBinder" />.
+        /// Gets a list of <see cref="IModelBinder"/>s used by this application.
         /// </summary>
-        public IList<ModelBinderDescriptor> ModelBinders { get; }
+        public IList<IModelBinder> ModelBinders { get; }
 
         /// <summary>
-        /// Gets a list of the <see cref="ModelValidatorProviderDescriptor" />s used by
-        /// <see cref="ModelBinding.Validation.CompositeModelValidatorProvider"/>.
+        /// Gets a list of <see cref="IModelValidatorProvider"/>s used by this application.
         /// </summary>
-        public IList<ModelValidatorProviderDescriptor> ModelValidatorProviders { get; }
+        public IList<IModelValidatorProvider> ModelValidatorProviders { get; }
 
         /// <summary>
         /// Gets a list of descriptors that represent <see cref="Rendering.IViewEngine"/> used
@@ -126,10 +121,9 @@ public int MaxModelValidationErrors
         public IList<ViewEngineDescriptor> ViewEngines { get; }
 
         /// <summary>
-        /// Gets a list of descriptors that represent
-        /// <see cref="ModelBinding.IValueProviderFactory"/> used by this application.
+        /// Gets a list of <see cref="IValueProviderFactory"/> used by this application.
         /// </summary>
-        public IList<ValueProviderFactoryDescriptor> ValueProviderFactories { get; }
+        public IList<IValueProviderFactory> ValueProviderFactories { get; }
 
         /// <summary>
         /// Gets a list of <see cref="IApplicationModelConvention"/> instances that will be applied to
diff --git a/src/Microsoft.AspNet.Mvc.Core/Rendering/ViewEngine/CompositeViewEngine.cs b/src/Microsoft.AspNet.Mvc.Core/Rendering/ViewEngine/CompositeViewEngine.cs
index f0f302dc3d..efc5caf7bb 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Rendering/ViewEngine/CompositeViewEngine.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Rendering/ViewEngine/CompositeViewEngine.cs
@@ -1,24 +1,55 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Framework.Internal;
+using Microsoft.Framework.OptionsModel;
 
 namespace Microsoft.AspNet.Mvc.Rendering
 {
     /// <inheritdoc />
     public class CompositeViewEngine : ICompositeViewEngine
     {
-        public CompositeViewEngine(IViewEngineProvider viewEngineProvider)
+        /// <summary>
+        /// Initializes a new instance of <see cref="CompositeViewEngine"/>.
+        /// </summary>
+        /// <param name="optionsAccessor">The options accessor for <see cref="MvcOptions"/>.</param>
+        /// <param name="typeActivatorCache">As <see cref="ITypeActivatorCache"/> instance that creates
+        /// an instance of type <see cref="IViewEngine"/>.</param>
+        /// <param name="serviceProvider">A <see cref="IServiceProvider"/> instance that retrieves services from the
+        /// service collection.</param>
+        public CompositeViewEngine(
+            IOptions<MvcOptions> optionsAccessor,
+            ITypeActivatorCache typeActivatorCache,
+            IServiceProvider serviceProvider)
         {
-            ViewEngines = viewEngineProvider.ViewEngines;
+            var viewEngines = new List<IViewEngine>();
+            foreach (var descriptor in optionsAccessor.Options.ViewEngines)
+            {
+                IViewEngine viewEngine;
+                if (descriptor.ViewEngine != null)
+                {
+                    viewEngine = descriptor.ViewEngine;
+                }
+                else
+                {
+                    viewEngine = typeActivatorCache.CreateInstance<IViewEngine>(
+                        serviceProvider, 
+                        descriptor.ViewEngineType);
+                }
+
+                viewEngines.Add(viewEngine);
+            }
+
+            ViewEngines = viewEngines;
         }
 
         /// <summary>
-        /// Gets the list of ViewEngines the CompositeViewEngine delegates to.
+        /// Gets the list of <see cref="IViewEngine"/> this instance of <see cref="CompositeViewEngine"/> delegates to.
         /// </summary>
-        public IReadOnlyList<IViewEngine> ViewEngines { get; private set; }
+        public IReadOnlyList<IViewEngine> ViewEngines { get;  }
 
         /// <inheritdoc />
         public ViewEngineResult FindPartialView([NotNull] ActionContext context,
diff --git a/src/Microsoft.AspNet.Mvc.Core/OptionDescriptors/ViewEngineDescriptor.cs b/src/Microsoft.AspNet.Mvc.Core/ViewEngineDescriptor.cs
similarity index 54%
rename from src/Microsoft.AspNet.Mvc.Core/OptionDescriptors/ViewEngineDescriptor.cs
rename to src/Microsoft.AspNet.Mvc.Core/ViewEngineDescriptor.cs
index f74c123cc7..d026acf554 100644
--- a/src/Microsoft.AspNet.Mvc.Core/OptionDescriptors/ViewEngineDescriptor.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ViewEngineDescriptor.cs
@@ -2,23 +2,30 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using Microsoft.AspNet.Mvc.Core;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc.OptionDescriptors
+namespace Microsoft.AspNet.Mvc
 {
     /// <summary>
     /// Encapsulates information that describes an <see cref="IViewEngine"/>.
     /// </summary>
-    public class ViewEngineDescriptor : OptionDescriptor<IViewEngine>
+    public class ViewEngineDescriptor
     {
         /// <summary>
         /// Creates a new instance of <see cref="ViewEngineDescriptor"/>.
         /// </summary>
         /// <param name="type">The <see cref="IViewEngine"/> type that the descriptor represents.</param>
         public ViewEngineDescriptor([NotNull] Type type)
-            : base(type)
         {
+            if (!typeof(IViewEngine).IsAssignableFrom(type))
+            {
+                var message = Resources.FormatTypeMustDeriveFromType(type.FullName, typeof(IViewEngine).FullName);
+                throw new ArgumentException(message, nameof(type));
+            }
+
+            ViewEngineType = type;
         }
 
         /// <summary>
@@ -26,8 +33,19 @@ public ViewEngineDescriptor([NotNull] Type type)
         /// </summary>
         /// <param name="viewEngine">An instance of <see cref="IViewEngine"/> that the descriptor represents.</param>
         public ViewEngineDescriptor([NotNull] IViewEngine viewEngine)
-            : base(viewEngine)
         {
+            ViewEngine = viewEngine;
+            ViewEngineType = viewEngine.GetType();
         }
+
+        /// <summary>
+        /// Gets the type of the <see cref="IViewEngine"/> described by this <see cref="ViewEngineDescriptor"/>.
+        /// </summary>
+        public Type ViewEngineType { get; }
+
+        /// <summary>
+        /// Gets the <see cref="IViewEngine"/> instance described by this <see cref="ViewEngineDescriptor"/>.
+        /// </summary>
+        public IViewEngine ViewEngine { get; }
     }
 }
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Mvc.ModelBinding/BinderMetadata/ModelBinderAttribute.cs b/src/Microsoft.AspNet.Mvc.ModelBinding/BinderMetadata/ModelBinderAttribute.cs
index bd94966bdb..45770cea6c 100644
--- a/src/Microsoft.AspNet.Mvc.ModelBinding/BinderMetadata/ModelBinderAttribute.cs
+++ b/src/Microsoft.AspNet.Mvc.ModelBinding/BinderMetadata/ModelBinderAttribute.cs
@@ -41,14 +41,12 @@ public Type BinderType
             {
                 if (value != null)
                 {
-                    if (!typeof(IModelBinder).IsAssignableFrom(value) &&
-                        !typeof(IModelBinderProvider).IsAssignableFrom(value))
+                    if (!typeof(IModelBinder).IsAssignableFrom(value))
                     {
                         throw new InvalidOperationException(
-                            Resources.FormatBinderType_MustBeIModelBinderOrIModelBinderProvider(
+                            Resources.FormatBinderType_MustBeIModelBinder(
                                 value.FullName,
-                                typeof(IModelBinder).FullName,
-                                typeof(IModelBinderProvider).FullName));
+                                typeof(IModelBinder).FullName));
                     }
                 }
 
diff --git a/src/Microsoft.AspNet.Mvc.ModelBinding/Binders/BinderTypeBasedModelBinder.cs b/src/Microsoft.AspNet.Mvc.ModelBinding/Binders/BinderTypeBasedModelBinder.cs
index 6eb0710762..bebadda706 100644
--- a/src/Microsoft.AspNet.Mvc.ModelBinding/Binders/BinderTypeBasedModelBinder.cs
+++ b/src/Microsoft.AspNet.Mvc.ModelBinding/Binders/BinderTypeBasedModelBinder.cs
@@ -17,10 +17,9 @@ public class BinderTypeBasedModelBinder : IModelBinder
     {
         private readonly Func<Type, ObjectFactory> _createFactory =
             (t) => ActivatorUtilities.CreateFactory(t, Type.EmptyTypes);
-        private ConcurrentDictionary<Type, ObjectFactory> _typeActivatorCache =
+        private readonly ConcurrentDictionary<Type, ObjectFactory> _typeActivatorCache =
                new ConcurrentDictionary<Type, ObjectFactory>();
 
-
         public async Task<ModelBindingResult> BindModelAsync(ModelBindingContext bindingContext)
         {
             if (bindingContext.BinderType == null)
@@ -37,19 +36,10 @@ public async Task<ModelBindingResult> BindModelAsync(ModelBindingContext binding
             var modelBinder = instance as IModelBinder;
             if (modelBinder == null)
             {
-                var modelBinderProvider = instance as IModelBinderProvider;
-                if (modelBinderProvider != null)
-                {
-                    modelBinder = new CompositeModelBinder(modelBinderProvider.ModelBinders);
-                }
-                else
-                {
-                    throw new InvalidOperationException(
-                        Resources.FormatBinderType_MustBeIModelBinderOrIModelBinderProvider(
-                            bindingContext.BinderType.FullName,
-                            typeof(IModelBinder).FullName,
-                            typeof(IModelBinderProvider).FullName));
-                }
+                throw new InvalidOperationException(
+                    Resources.FormatBinderType_MustBeIModelBinder(
+                        bindingContext.BinderType.FullName,
+                        typeof(IModelBinder).FullName));
             }
 
             var result = await modelBinder.BindModelAsync(bindingContext);
diff --git a/src/Microsoft.AspNet.Mvc.Core/ModelBinders/ServicesModelBinder.cs b/src/Microsoft.AspNet.Mvc.ModelBinding/Binders/ServicesModelBinder.cs
similarity index 100%
rename from src/Microsoft.AspNet.Mvc.Core/ModelBinders/ServicesModelBinder.cs
rename to src/Microsoft.AspNet.Mvc.ModelBinding/Binders/ServicesModelBinder.cs
diff --git a/src/Microsoft.AspNet.Mvc.ModelBinding/Properties/Resources.Designer.cs b/src/Microsoft.AspNet.Mvc.ModelBinding/Properties/Resources.Designer.cs
index b4bd26fbbb..44ed02e8f1 100644
--- a/src/Microsoft.AspNet.Mvc.ModelBinding/Properties/Resources.Designer.cs
+++ b/src/Microsoft.AspNet.Mvc.ModelBinding/Properties/Resources.Designer.cs
@@ -459,19 +459,19 @@ internal static string FormatModelStateDictionary_MaxModelStateErrors()
         }
 
         /// <summary>
-        /// The type '{0}' must implement either '{1}' or '{2}' to be used as a model binder.
+        /// The type '{0}' must implement '{1}' to be used as a model binder.
         /// </summary>
-        internal static string BinderType_MustBeIModelBinderOrIModelBinderProvider
+        internal static string BinderType_MustBeIModelBinder
         {
-            get { return GetString("BinderType_MustBeIModelBinderOrIModelBinderProvider"); }
+            get { return GetString("BinderType_MustBeIModelBinder"); }
         }
 
         /// <summary>
-        /// The type '{0}' must implement either '{1}' or '{2}' to be used as a model binder.
+        /// The type '{0}' must implement '{1}' to be used as a model binder.
         /// </summary>
-        internal static string FormatBinderType_MustBeIModelBinderOrIModelBinderProvider(object p0, object p1, object p2)
+        internal static string FormatBinderType_MustBeIModelBinder(object p0, object p1)
         {
-            return string.Format(CultureInfo.CurrentCulture, GetString("BinderType_MustBeIModelBinderOrIModelBinderProvider"), p0, p1, p2);
+            return string.Format(CultureInfo.CurrentCulture, GetString("BinderType_MustBeIModelBinder"), p0, p1);
         }
 
         /// <summary>
diff --git a/src/Microsoft.AspNet.Mvc.ModelBinding/Resources.resx b/src/Microsoft.AspNet.Mvc.ModelBinding/Resources.resx
index d1104cd28e..0654d7794a 100644
--- a/src/Microsoft.AspNet.Mvc.ModelBinding/Resources.resx
+++ b/src/Microsoft.AspNet.Mvc.ModelBinding/Resources.resx
@@ -201,8 +201,8 @@
   <data name="ModelStateDictionary_MaxModelStateErrors" xml:space="preserve">
     <value>The maximum number of allowed model errors has been reached.</value>
   </data>
-  <data name="BinderType_MustBeIModelBinderOrIModelBinderProvider" xml:space="preserve">
-    <value>The type '{0}' must implement either '{1}' or '{2}' to be used as a model binder.</value>
+  <data name="BinderType_MustBeIModelBinder" xml:space="preserve">
+    <value>The type '{0}' must implement '{1}' to be used as a model binder.</value>
   </data>
   <data name="ModelBinderUtil_ValueInvalid" xml:space="preserve">
     <value>The value '{0}' is not valid for {1}.</value>
diff --git a/src/Microsoft.AspNet.Mvc.ModelBinding/Validation/DefaultObjectValidator.cs b/src/Microsoft.AspNet.Mvc.ModelBinding/Validation/DefaultObjectValidator.cs
index 8f46da0fe5..f54ecadba8 100644
--- a/src/Microsoft.AspNet.Mvc.ModelBinding/Validation/DefaultObjectValidator.cs
+++ b/src/Microsoft.AspNet.Mvc.ModelBinding/Validation/DefaultObjectValidator.cs
@@ -17,15 +17,21 @@ namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
     /// </summary>
     public class DefaultObjectValidator : IObjectModelValidator
     {
-        private readonly IValidationExcludeFiltersProvider _excludeFilterProvider;
+        private readonly IList<IExcludeTypeValidationFilter> _excludeFilters;
         private readonly IModelMetadataProvider _modelMetadataProvider;
-        
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="DefaultObjectValidator"/>.
+        /// </summary>
+        /// <param name="excludeFilters"><see cref="IExcludeTypeValidationFilter"/>s that determine
+        /// types to exclude from validation.</param>
+        /// <param name="modelMetadataProvider">The <see cref="IModelMetadataProvider"/>.</param>
         public DefaultObjectValidator(
-            IValidationExcludeFiltersProvider excludeFilterProvider,
-            IModelMetadataProvider modelMetadataProvider)
+            [NotNull] IList<IExcludeTypeValidationFilter> excludeFilters,
+            [NotNull] IModelMetadataProvider modelMetadataProvider)
         {
-            _excludeFilterProvider = excludeFilterProvider;
             _modelMetadataProvider = modelMetadataProvider;
+            _excludeFilters = excludeFilters;
         }
 
         /// <inheritdoc />
@@ -39,13 +45,13 @@ public void Validate([NotNull] ModelValidationContext modelValidationContext)
 
             ValidateNonVisitedNodeAndChildren(
                 modelValidationContext.RootPrefix,
-                validationContext, 
+                validationContext,
                 validators: null);
         }
 
         private bool ValidateNonVisitedNodeAndChildren(
             string modelKey,
-            ValidationContext validationContext, 
+            ValidationContext validationContext,
             IList<IModelValidator> validators)
         {
             var modelValidationContext = validationContext.ModelValidationContext;
@@ -98,7 +104,7 @@ private bool ValidateNonVisitedNodeAndChildren(
 
             // We don't need to recursively traverse the graph for types that shouldn't be validated
             var modelType = modelExplorer.Model.GetType();
-            if (IsTypeExcludedFromValidation(_excludeFilterProvider.ExcludeFilters, modelType))
+            if (IsTypeExcludedFromValidation(_excludeFilters, modelType))
             {
                 var result = ShallowValidate(modelKey, modelExplorer, validationContext, validators);
                 MarkPropertiesAsSkipped(modelKey, modelExplorer.Metadata, validationContext);
@@ -146,7 +152,7 @@ private void MarkPropertiesAsSkipped(string currentModelKey, ModelMetadata metad
             if (fieldValidationState != ModelValidationState.Unvalidated)
             {
                 return;
-            }   
+            }
 
             foreach (var childMetadata in metadata.Properties)
             {
@@ -182,7 +188,7 @@ private bool ValidateProperties(
                 var propertyBindingName = propertyMetadata.BinderModelName ?? propertyMetadata.PropertyName;
                 var childKey = ModelBindingHelper.CreatePropertyModelName(currentModelKey, propertyBindingName);
                 if (!ValidateNonVisitedNodeAndChildren(
-                    childKey, 
+                    childKey,
                     propertyValidationContext,
                     validators: null))
                 {
@@ -300,14 +306,8 @@ private static bool ShallowValidate(
             return isValid;
         }
 
-        private bool IsTypeExcludedFromValidation(IReadOnlyList<IExcludeTypeValidationFilter> filters, Type type)
+        private bool IsTypeExcludedFromValidation(IList<IExcludeTypeValidationFilter> filters, Type type)
         {
-            // This can be set to null in ModelBinding scenarios which does not flow through this path.
-            if (filters == null)
-            {
-                return false;
-            }
-
             return filters.Any(filter => filter.IsTypeExcluded(type));
         }
 
diff --git a/src/Microsoft.AspNet.Mvc.Core/Formatters/DefaultTypeBasedExcludeFilter.cs b/src/Microsoft.AspNet.Mvc.ModelBinding/Validation/DefaultTypeBasedExcludeFilter.cs
similarity index 93%
rename from src/Microsoft.AspNet.Mvc.Core/Formatters/DefaultTypeBasedExcludeFilter.cs
rename to src/Microsoft.AspNet.Mvc.ModelBinding/Validation/DefaultTypeBasedExcludeFilter.cs
index 86dac927c5..b8d50e03c4 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Formatters/DefaultTypeBasedExcludeFilter.cs
+++ b/src/Microsoft.AspNet.Mvc.ModelBinding/Validation/DefaultTypeBasedExcludeFilter.cs
@@ -2,10 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
 {
     /// <summary>
     /// Provides an implementation of <see cref="IExcludeTypeValidationFilter"/> which can filter
diff --git a/src/Microsoft.AspNet.Mvc.Core/Formatters/DefaultTypeNameBasedExcludeFilter.cs b/src/Microsoft.AspNet.Mvc.ModelBinding/Validation/DefaultTypeNameBasedExcludeFilter.cs
similarity index 95%
rename from src/Microsoft.AspNet.Mvc.Core/Formatters/DefaultTypeNameBasedExcludeFilter.cs
rename to src/Microsoft.AspNet.Mvc.ModelBinding/Validation/DefaultTypeNameBasedExcludeFilter.cs
index 25be7d9272..cccb27a847 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Formatters/DefaultTypeNameBasedExcludeFilter.cs
+++ b/src/Microsoft.AspNet.Mvc.ModelBinding/Validation/DefaultTypeNameBasedExcludeFilter.cs
@@ -2,10 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
 {
     /// <summary>
     /// Provides an implementation of <see cref="IExcludeTypeValidationFilter"/> which can filter
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Properties/Resources.Designer.cs b/src/Microsoft.AspNet.Mvc.Razor/Properties/Resources.Designer.cs
index fee66c9588..8a4691f31e 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Properties/Resources.Designer.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Properties/Resources.Designer.cs
@@ -219,7 +219,7 @@ internal static string FormatRazorPage_MethodCannotBeCalled(object p0)
         }
 
         /// <summary>
-        /// {0} has not been called for the page '{1}'.
+        /// {0} has not been called for the page at '{1}'.
         /// </summary>
         internal static string RenderBodyNotCalled
         {
@@ -227,7 +227,7 @@ internal static string RenderBodyNotCalled
         }
 
         /// <summary>
-        /// {0} has not been called for the page '{1}'.
+        /// {0} has not been called for the page at '{1}'.
         /// </summary>
         internal static string FormatRenderBodyNotCalled(object p0, object p1)
         {
@@ -283,7 +283,7 @@ internal static string FormatSectionNotDefined(object p0)
         }
 
         /// <summary>
-        /// The following sections have been defined but have not been rendered for the page '{0}': '{1}'.
+        /// The following sections have been defined but have not been rendered by the page at '{0}': '{1}'.
         /// </summary>
         internal static string SectionsNotRendered
         {
@@ -291,7 +291,7 @@ internal static string SectionsNotRendered
         }
 
         /// <summary>
-        /// The following sections have been defined but have not been rendered for the page '{0}': '{1}'.
+        /// The following sections have been defined but have not been rendered by the page at '{0}': '{1}'.
         /// </summary>
         internal static string FormatSectionsNotRendered(object p0, object p1)
         {
diff --git a/src/Microsoft.AspNet.Mvc.Razor/RazorViewEngine.cs b/src/Microsoft.AspNet.Mvc.Razor/RazorViewEngine.cs
index b6dc4c0381..75317a0444 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/RazorViewEngine.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/RazorViewEngine.cs
@@ -6,10 +6,9 @@
 using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
-using Microsoft.AspNet.Mvc.Razor.Internal;
-using Microsoft.AspNet.Mvc.Razor.OptionDescriptors;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.Framework.Internal;
+using Microsoft.Framework.OptionsModel;
 
 namespace Microsoft.AspNet.Mvc.Razor
 {
@@ -41,7 +40,7 @@ public class RazorViewEngine : IRazorViewEngine
 
         private readonly IRazorPageFactory _pageFactory;
         private readonly IRazorViewFactory _viewFactory;
-        private readonly IReadOnlyList<IViewLocationExpander> _viewLocationExpanders;
+        private readonly IList<IViewLocationExpander> _viewLocationExpanders;
         private readonly IViewLocationCache _viewLocationCache;
 
         /// <summary>
@@ -50,12 +49,12 @@ public class RazorViewEngine : IRazorViewEngine
         /// <param name="pageFactory">The page factory used for creating <see cref="IRazorPage"/> instances.</param>
         public RazorViewEngine(IRazorPageFactory pageFactory,
                                IRazorViewFactory viewFactory,
-                               IViewLocationExpanderProvider viewLocationExpanderProvider,
+                               IOptions<RazorViewEngineOptions> optionsAccessor,
                                IViewLocationCache viewLocationCache)
         {
             _pageFactory = pageFactory;
             _viewFactory = viewFactory;
-            _viewLocationExpanders = viewLocationExpanderProvider.ViewLocationExpanders;
+            _viewLocationExpanders = optionsAccessor.Options.ViewLocationExpanders;
             _viewLocationCache = viewLocationCache;
         }
 
diff --git a/src/Microsoft.AspNet.Mvc.Razor/OptionDescriptors/RazorViewEngineOptions.cs b/src/Microsoft.AspNet.Mvc.Razor/RazorViewEngineOptions.cs
similarity index 73%
rename from src/Microsoft.AspNet.Mvc.Razor/OptionDescriptors/RazorViewEngineOptions.cs
rename to src/Microsoft.AspNet.Mvc.Razor/RazorViewEngineOptions.cs
index e906a8b483..6a505a24fa 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/OptionDescriptors/RazorViewEngineOptions.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/RazorViewEngineOptions.cs
@@ -4,23 +4,21 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.AspNet.FileProviders;
-using Microsoft.AspNet.Mvc.Razor.OptionDescriptors;
 
 namespace Microsoft.AspNet.Mvc.Razor
 {
     /// <summary>
-    /// Provides programmatic configuration for the default <see cref="Rendering.IViewEngine"/>.
+    /// Provides programmatic configuration for the <see cref="RazorViewEngine"/>.
     /// </summary>
     public class RazorViewEngineOptions
     {
         private IFileProvider _fileProvider;
 
         /// <summary>
-        /// Get a <see cref="IList{T}"/> of descriptors for <see cref="IViewLocationExpander" />s used by this
-        /// application.
+        /// Get a <see cref="IList{IViewLocationExpander}"/> used by the <see cref="RazorViewEngine"/>.
         /// </summary>
-        public IList<ViewLocationExpanderDescriptor> ViewLocationExpanders { get; }
-            = new List<ViewLocationExpanderDescriptor>();
+        public IList<IViewLocationExpander> ViewLocationExpanders { get; }
+            = new List<IViewLocationExpander>();
 
         /// <summary>
         /// Gets or sets the <see cref="IFileProvider" /> used by <see cref="RazorViewEngine"/> to locate Razor files on
diff --git a/src/Microsoft.AspNet.Mvc/MvcOptionsSetup.cs b/src/Microsoft.AspNet.Mvc/MvcOptionsSetup.cs
index 8423865cfb..e057662157 100644
--- a/src/Microsoft.AspNet.Mvc/MvcOptionsSetup.cs
+++ b/src/Microsoft.AspNet.Mvc/MvcOptionsSetup.cs
@@ -32,7 +32,7 @@ public static void ConfigureMvc(MvcOptions options)
             // Set up ModelBinding
             options.ModelBinders.Add(new BinderTypeBasedModelBinder());
             options.ModelBinders.Add(new ServicesModelBinder());
-            options.ModelBinders.Add(typeof(BodyModelBinder));
+            options.ModelBinders.Add(new BodyModelBinder());
             options.ModelBinders.Add(new HeaderModelBinder());
             options.ModelBinders.Add(new TypeConverterModelBinder());
             options.ModelBinders.Add(new TypeMatchModelBinder());
diff --git a/src/Microsoft.AspNet.Mvc/MvcServices.cs b/src/Microsoft.AspNet.Mvc/MvcServices.cs
index 6682f2164f..23002b7c7a 100644
--- a/src/Microsoft.AspNet.Mvc/MvcServices.cs
+++ b/src/Microsoft.AspNet.Mvc/MvcServices.cs
@@ -10,11 +10,9 @@
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.ModelBinding.Metadata;
 using Microsoft.AspNet.Mvc.ModelBinding.Validation;
-using Microsoft.AspNet.Mvc.OptionDescriptors;
 using Microsoft.AspNet.Mvc.Razor;
 using Microsoft.AspNet.Mvc.Razor.Compilation;
 using Microsoft.AspNet.Mvc.Razor.Directives;
-using Microsoft.AspNet.Mvc.Razor.OptionDescriptors;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.AspNet.Mvc.Routing;
 using Microsoft.AspNet.Mvc.ViewComponents;
@@ -63,7 +61,12 @@ public static IServiceCollection GetDefaultServices()
             services.AddSingleton<IActionSelectorDecisionTreeProvider, ActionSelectorDecisionTreeProvider>();
             services.AddSingleton<IActionSelector, DefaultActionSelector>();
             services.AddTransient<IControllerActionArgumentBinder, DefaultControllerActionArgumentBinder>();
-            services.AddTransient<IObjectModelValidator, DefaultObjectValidator>();
+            services.AddTransient<IObjectModelValidator>(serviceProvider =>
+            {
+                var options = serviceProvider.GetRequiredService<IOptions<MvcOptions>>().Options;
+                var modelMetadataProvider = serviceProvider.GetRequiredService<IModelMetadataProvider>();
+                return new DefaultObjectValidator(options.ValidationExcludeFilters, modelMetadataProvider);
+            });
 
             services.AddTransient<IActionDescriptorProvider, ControllerActionDescriptorProvider>();
 
@@ -90,24 +93,14 @@ public static IServiceCollection GetDefaultServices()
             });
 
             services.AddTransient<IInputFormatterSelector, DefaultInputFormatterSelector>();
-            services.AddScoped<IInputFormattersProvider, DefaultInputFormattersProvider>();
-
-            services.AddTransient<IModelBinderProvider, DefaultModelBindersProvider>();
-            services.AddTransient<IValueProviderFactoryProvider, DefaultValueProviderFactoryProvider>();
-            services.AddTransient<IOutputFormattersProvider, DefaultOutputFormattersProvider>();
             services.AddInstance(new JsonOutputFormatter());
 
-            services.AddTransient<IModelValidatorProviderProvider, DefaultModelValidatorProviderProvider>();
-            services.AddTransient<IValidationExcludeFiltersProvider, DefaultValidationExcludeFiltersProvider>();
-
             // Razor, Views and runtime compilation
 
             // The provider is inexpensive to initialize and provides ViewEngines that may require request
             // specific services.
             services.AddScoped<ICompositeViewEngine, CompositeViewEngine>();
-            services.AddTransient<IViewEngineProvider, DefaultViewEngineProvider>();
-            // Transient since the IViewLocationExpanders returned by the instance is cached by view engines.
-            services.AddTransient<IViewLocationExpanderProvider, DefaultViewLocationExpanderProvider>();
+
             // Caches view locations that are valid for the lifetime of the application.
             services.AddSingleton<IViewLocationCache, DefaultViewLocationCache>();
             services.AddSingleton<ICodeTreeCache>(serviceProvider =>