diff --git a/src/Samples/Wpf/WpfTodo.UITests/TodoAppTests.cs b/src/Samples/Wpf/WpfTodo.UITests/TodoAppTests.cs
index 6889da44..cdc38f0d 100644
--- a/src/Samples/Wpf/WpfTodo.UITests/TodoAppTests.cs
+++ b/src/Samples/Wpf/WpfTodo.UITests/TodoAppTests.cs
@@ -24,7 +24,7 @@ public void AutomateTest()
                 Name = "WpfTodo"
             };
 
-            CoreAppXmlConfiguration.Instance.WorkSessionLocation = new DirectoryInfo(workPath);
+            CoreConfigurationLocator.Get().WorkSessionLocation = new DirectoryInfo(workPath);
             using (var workSession = new WorkSession(workConfiguration, new NullWorkEnvironment()))
             {
                 var screenRepository = workSession.Attach(Application);
diff --git a/src/TestStack.White.Reporting/Configuration/ReportingAppXmlConfiguration.cs b/src/TestStack.White.Reporting/Configuration/ReportingAppXmlConfiguration.cs
deleted file mode 100644
index 88847497..00000000
--- a/src/TestStack.White.Reporting/Configuration/ReportingAppXmlConfiguration.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using TestStack.White.Bricks;
-using TestStack.White.Configuration;
-
-namespace TestStack.White.Reporting.Configuration
-{
-    public class ReportingAppXmlConfiguration : AssemblyConfiguration, ReportingConfiguration
-    {
-        private static ReportingConfiguration instance;
-
-        private static readonly Dictionary<string, object> DefaultValues = new Dictionary<string, object>();
-
-        static ReportingAppXmlConfiguration()
-        {
-            DefaultValues.Add("PublishTestReports", true);
-        }
-
-        private ReportingAppXmlConfiguration() : base("White", "Reporting", DefaultValues, 
-            CoreAppXmlConfiguration.Instance.LoggerFactory.Create(typeof(ReportingAppXmlConfiguration))) {}
-
-        public static ReportingConfiguration Instance
-        {
-            get { return instance ?? (instance = new ReportingAppXmlConfiguration()); }
-        }
-
-        public virtual bool PublishTestReports
-        {
-            get { return Convert.ToBoolean(UsedValues["PublishTestReports"]); }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/TestStack.White.Reporting/Configuration/ReportingConfiguration.cs b/src/TestStack.White.Reporting/Configuration/ReportingConfiguration.cs
index 74a0cc36..b434fbd0 100644
--- a/src/TestStack.White.Reporting/Configuration/ReportingConfiguration.cs
+++ b/src/TestStack.White.Reporting/Configuration/ReportingConfiguration.cs
@@ -1,7 +1,27 @@
+using System.Collections.Generic;
+using TestStack.White.Configuration;
+
 namespace TestStack.White.Reporting.Configuration
 {
-    public interface ReportingConfiguration
+    public class ReportingConfiguration : ConfigurationBase<ReportingConfiguration>
     {
-        bool PublishTestReports { get; }
+        private const string PublishTestReportsKey = "PublishTestReports";
+
+        public override Dictionary<string, object> DefaultValues
+        {
+            get
+            {
+                return new Dictionary<string, object>
+                {
+                    {PublishTestReportsKey, true}
+                };
+            }
+        }
+
+        public virtual bool PublishTestReports
+        {
+            get { return GetValueBoolean(PublishTestReportsKey); }
+            set { SetValue(PublishTestReportsKey, value); }
+        }
     }
 }
\ No newline at end of file
diff --git a/src/TestStack.White.Reporting/Configuration/ReportingConfigurationLocator.cs b/src/TestStack.White.Reporting/Configuration/ReportingConfigurationLocator.cs
new file mode 100644
index 00000000..df99e74c
--- /dev/null
+++ b/src/TestStack.White.Reporting/Configuration/ReportingConfigurationLocator.cs
@@ -0,0 +1,24 @@
+using TestStack.White.Configuration.Readers;
+
+namespace TestStack.White.Reporting.Configuration
+{
+    public static class ReportingConfigurationLocator
+    {
+        private static ReportingConfiguration reportingConfiguration;
+
+        public static ReportingConfiguration Get()
+        {
+            if (reportingConfiguration == null)
+            {
+                Set(new AppConfigReader("White", "Reporting"));
+            }
+            return reportingConfiguration;
+        }
+
+        public static void Set(IConfigurationReader configurationReader)
+        {
+            reportingConfiguration = new ReportingConfiguration();
+            configurationReader.FillConfigurationFromReader(reportingConfiguration);
+        }
+    }
+}
diff --git a/src/TestStack.White.Reporting/Domain/SubFlow.cs b/src/TestStack.White.Reporting/Domain/SubFlow.cs
index d99a0a4d..f30b12c1 100644
--- a/src/TestStack.White.Reporting/Domain/SubFlow.cs
+++ b/src/TestStack.White.Reporting/Domain/SubFlow.cs
@@ -18,7 +18,7 @@ public class SubFlow
         private readonly string directory;
         private DateTime screenCreationTime;
         private readonly string name;
-        private static readonly ILogger Logger = CoreAppXmlConfiguration.Instance.LoggerFactory.Create(typeof(SubFlow));
+        private static readonly ILogger Logger = CoreConfigurationLocator.Get().LoggerFactory.Create(typeof(SubFlow));
 
         public SubFlow(string subFlowName, string flowName, string archiveLocation)
         {
diff --git a/src/TestStack.White.Reporting/Domain/SubFlows.cs b/src/TestStack.White.Reporting/Domain/SubFlows.cs
index 1e52240f..f38d49cc 100644
--- a/src/TestStack.White.Reporting/Domain/SubFlows.cs
+++ b/src/TestStack.White.Reporting/Domain/SubFlows.cs
@@ -11,7 +11,7 @@ public class SubFlows : List<SubFlow>
         private readonly string archiveLocation;
         private readonly string flowName;
         private int currentSubFlowIndex = -1;
-        private readonly ILogger logger = CoreAppXmlConfiguration.Instance.LoggerFactory.Create(typeof(SubFlow));
+        private readonly ILogger logger = CoreConfigurationLocator.Get().LoggerFactory.Create(typeof(SubFlow));
 
         public SubFlows(string archiveLocation, string flowName)
         {
diff --git a/src/TestStack.White.Reporting/TestStack.White.Reporting.csproj b/src/TestStack.White.Reporting/TestStack.White.Reporting.csproj
index ede5ba94..55b252ef 100644
--- a/src/TestStack.White.Reporting/TestStack.White.Reporting.csproj
+++ b/src/TestStack.White.Reporting/TestStack.White.Reporting.csproj
@@ -71,8 +71,8 @@
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Configuration\ReportingConfigurationLocator.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Configuration\ReportingAppXmlConfiguration.cs" />
     <Compile Include="Configuration\ReportingConfiguration.cs" />
     <Compile Include="Domain\IReport.cs" />
     <Compile Include="Domain\NullSessionReport.cs" />
@@ -113,5 +113,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
-
+</Project>
\ No newline at end of file
diff --git a/src/TestStack.White.ScreenObjects/AppScreen.cs b/src/TestStack.White.ScreenObjects/AppScreen.cs
index 84eee408..6460a7e2 100644
--- a/src/TestStack.White.ScreenObjects/AppScreen.cs
+++ b/src/TestStack.White.ScreenObjects/AppScreen.cs
@@ -13,7 +13,7 @@ namespace TestStack.White.ScreenObjects
     //TODO: Take care of act kind of stuff by putting attribute
     public class AppScreen : RepositoryComponent
     {
-        private readonly ILogger logger = CoreAppXmlConfiguration.Instance.LoggerFactory.Create(typeof(AppScreen));
+        private readonly ILogger logger = CoreConfigurationLocator.Get().LoggerFactory.Create(typeof(AppScreen));
 
         public AppScreen(Window window, ScreenRepository screenRepository) : base(window, screenRepository) {}
 
diff --git a/src/TestStack.White.ScreenObjects/Configuration/RepositoryAppXmlConfiguration.cs b/src/TestStack.White.ScreenObjects/Configuration/RepositoryAppXmlConfiguration.cs
deleted file mode 100644
index 14e66f1a..00000000
--- a/src/TestStack.White.ScreenObjects/Configuration/RepositoryAppXmlConfiguration.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using TestStack.White.Bricks;
-using TestStack.White.Configuration;
-
-namespace TestStack.White.ScreenObjects.Configuration
-{
-    public class RepositoryAppXmlConfiguration : AssemblyConfiguration, RepositoryConfiguration
-    {
-        public static RepositoryConfiguration instance;
-
-        private static readonly Dictionary<string, object> DefaultValues = new Dictionary<string, object>();
-        private const string UseHistoryKey = "UseHistory";
-        private const string ServiceCallHistoryLocationKey = "ServiceCallHistoryLocation";
-        private const string RecordFlowKey = "RecordFlow";
-
-        static RepositoryAppXmlConfiguration()
-        {
-            DefaultValues[RecordFlowKey] = false;
-            DefaultValues[ServiceCallHistoryLocationKey] = ".";
-            DefaultValues[UseHistoryKey] = false;
-        }
-
-        public static RepositoryConfiguration Instance
-        {
-            get { return instance ?? (instance = new RepositoryAppXmlConfiguration()); }
-        }
-
-        private RepositoryAppXmlConfiguration() : base("White", "Repository", DefaultValues, 
-            CoreAppXmlConfiguration.Instance.LoggerFactory.Create(typeof(RepositoryAppXmlConfiguration))) {}
-
-        public virtual bool RecordFlow
-        {
-            get { return Convert.ToBoolean(UsedValues[RecordFlowKey]); }
-        }
-
-        public virtual DirectoryInfo ServiceCallHistoryLocation
-        {
-            get { return new DirectoryInfo(UsedValues[ServiceCallHistoryLocationKey]); }
-        }
-
-        public virtual bool UseHistory
-        {
-            get { return Convert.ToBoolean(UsedValues[UseHistoryKey]); }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/TestStack.White.ScreenObjects/Configuration/RepositoryConfiguration.cs b/src/TestStack.White.ScreenObjects/Configuration/RepositoryConfiguration.cs
index 28e6f549..98f76621 100644
--- a/src/TestStack.White.ScreenObjects/Configuration/RepositoryConfiguration.cs
+++ b/src/TestStack.White.ScreenObjects/Configuration/RepositoryConfiguration.cs
@@ -1,12 +1,45 @@
+using System.Collections.Generic;
 using System.IO;
+using TestStack.White.Configuration;
 
 namespace TestStack.White.ScreenObjects.Configuration
 {
-    //TODO: Power management
-    public interface RepositoryConfiguration
+    // TODO: Power management
+    public class RepositoryConfiguration : ConfigurationBase<RepositoryConfiguration>
     {
-        bool RecordFlow { get; }
-        DirectoryInfo ServiceCallHistoryLocation { get; }
-        bool UseHistory { get; }
+        private const string RecordFlowKey = "RecordFlow";
+        private const string ServiceCallHistoryLocationKey = "ServiceCallHistoryLocation";
+        private const string UseHistoryKey = "UseHistory";
+
+        public override Dictionary<string, object> DefaultValues
+        {
+            get
+            {
+                return new Dictionary<string, object>
+                {
+                    {RecordFlowKey, false},
+                    {ServiceCallHistoryLocationKey, "."},
+                    {UseHistoryKey, false}
+                };
+            }
+        }
+
+        public virtual bool RecordFlow
+        {
+            get { return GetValueBoolean(RecordFlowKey); }
+            set { SetValue(RecordFlowKey, value); }
+        }
+
+        public virtual DirectoryInfo ServiceCallHistoryLocation
+        {
+            get { return new DirectoryInfo(GetValue(ServiceCallHistoryLocationKey)); }
+            set { SetValue(ServiceCallHistoryLocationKey, value); }
+        }
+
+        public virtual bool UseHistory
+        {
+            get { return GetValueBoolean(UseHistoryKey); }
+            set { SetValue(UseHistoryKey, value); }
+        }
     }
 }
\ No newline at end of file
diff --git a/src/TestStack.White.ScreenObjects/Configuration/RepositoryConfigurationLocator.cs b/src/TestStack.White.ScreenObjects/Configuration/RepositoryConfigurationLocator.cs
new file mode 100644
index 00000000..79632c73
--- /dev/null
+++ b/src/TestStack.White.ScreenObjects/Configuration/RepositoryConfigurationLocator.cs
@@ -0,0 +1,24 @@
+using TestStack.White.Configuration.Readers;
+
+namespace TestStack.White.ScreenObjects.Configuration
+{
+    public static class RepositoryConfigurationLocator
+    {
+        private static RepositoryConfiguration repositoryConfiguration;
+
+        public static RepositoryConfiguration Get()
+        {
+            if (repositoryConfiguration == null)
+            {
+                Set(new AppConfigReader("White", "Repository"));
+            }
+            return repositoryConfiguration;
+        }
+
+        public static void Set(IConfigurationReader configurationReader)
+        {
+            repositoryConfiguration = new RepositoryConfiguration();
+            configurationReader.FillConfigurationFromReader(repositoryConfiguration);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/TestStack.White.ScreenObjects/EntityMapping/Entity.cs b/src/TestStack.White.ScreenObjects/EntityMapping/Entity.cs
index f5eb8fd6..6a9ce153 100644
--- a/src/TestStack.White.ScreenObjects/EntityMapping/Entity.cs
+++ b/src/TestStack.White.ScreenObjects/EntityMapping/Entity.cs
@@ -18,7 +18,7 @@ namespace TestStack.White.ScreenObjects.EntityMapping
     public class Entity
     {
         [ScreenIgnore, XmlIgnore] private NestedEntities nestedEntities;
-        private readonly ILogger logger = CoreAppXmlConfiguration.Instance.LoggerFactory.Create(typeof(Entity));
+        private readonly ILogger logger = CoreConfigurationLocator.Get().LoggerFactory.Create(typeof(Entity));
         internal const BindingFlags BindingFlag = BindingFlags.Public | BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.DeclaredOnly | BindingFlags.IgnoreCase;
 
         protected Entity() {}
diff --git a/src/TestStack.White.ScreenObjects/ScreenFlow/WorkFlow.cs b/src/TestStack.White.ScreenObjects/ScreenFlow/WorkFlow.cs
index f93d4240..a4d075e8 100644
--- a/src/TestStack.White.ScreenObjects/ScreenFlow/WorkFlow.cs
+++ b/src/TestStack.White.ScreenObjects/ScreenFlow/WorkFlow.cs
@@ -20,7 +20,7 @@ public class WorkFlow
         private readonly GraphWriter graph;
         private readonly FlowWriter flow;
         private readonly string directory;
-        private static readonly ILogger Logger = CoreAppXmlConfiguration.Instance.LoggerFactory.Create(typeof(WorkFlow));
+        private static readonly ILogger Logger = CoreConfigurationLocator.Get().LoggerFactory.Create(typeof(WorkFlow));
 
         public WorkFlow(string name, string archiveLocation)
         {
diff --git a/src/TestStack.White.ScreenObjects/Services/ExecutionHistory.cs b/src/TestStack.White.ScreenObjects/Services/ExecutionHistory.cs
index eeb84851..4fee6792 100644
--- a/src/TestStack.White.ScreenObjects/Services/ExecutionHistory.cs
+++ b/src/TestStack.White.ScreenObjects/Services/ExecutionHistory.cs
@@ -13,7 +13,7 @@ public class ExecutionHistory
         private bool hasError;
 
         private static readonly string ExecutionHistoryFile = 
-            string.Format(@"{0}\{1}.xml", CoreAppXmlConfiguration.Instance.WorkSessionLocation, "ExecutionHistory");
+            string.Format(@"{0}\{1}.xml", CoreConfigurationLocator.Get().WorkSessionLocation, "ExecutionHistory");
 
         public ExecutionHistory()
         {
diff --git a/src/TestStack.White.ScreenObjects/Services/ServiceExecution.cs b/src/TestStack.White.ScreenObjects/Services/ServiceExecution.cs
index 17a59b0e..871acfbe 100644
--- a/src/TestStack.White.ScreenObjects/Services/ServiceExecution.cs
+++ b/src/TestStack.White.ScreenObjects/Services/ServiceExecution.cs
@@ -91,7 +91,7 @@ public virtual void RevertToSnapshot()
 
         public static ServiceExecution Create(IWorkEnvironment workEnvironment)
         {
-            if (!RepositoryAppXmlConfiguration.Instance.UseHistory)
+            if (!RepositoryConfigurationLocator.Get().UseHistory)
                 return new NullServiceExecution();
             ExecutionHistory executionHistory = ExecutionHistory.Create();
             return new ServiceExecution(executionHistory, workEnvironment ?? new NullWorkEnvironment());
diff --git a/src/TestStack.White.ScreenObjects/Services/WhiteExecution.cs b/src/TestStack.White.ScreenObjects/Services/WhiteExecution.cs
index 88f0db16..0819a5b8 100644
--- a/src/TestStack.White.ScreenObjects/Services/WhiteExecution.cs
+++ b/src/TestStack.White.ScreenObjects/Services/WhiteExecution.cs
@@ -37,7 +37,7 @@ public virtual T GetService<T>(params object[] objs) where T : Service
             if (services.TryGetValue(typeof (T), out service)) return (T) service;
 
             service = (T) Activator.CreateInstance(typeof(T), objs);
-            if (RepositoryAppXmlConfiguration.Instance.UseHistory || ReportingAppXmlConfiguration.Instance.PublishTestReports)
+            if (RepositoryConfigurationLocator.Get().UseHistory || ReportingConfigurationLocator.Get().PublishTestReports)
             {
                 service = (Service) DynamicProxyGenerator.Instance.CreateProxy(typeof (T), new ServiceInterceptor(service, serviceExecution, sessionReport));
                 services.Add(typeof (T), service);
diff --git a/src/TestStack.White.ScreenObjects/Sessions/WorkConfiguration.cs b/src/TestStack.White.ScreenObjects/Sessions/WorkConfiguration.cs
index 591a899f..a05d770f 100644
--- a/src/TestStack.White.ScreenObjects/Sessions/WorkConfiguration.cs
+++ b/src/TestStack.White.ScreenObjects/Sessions/WorkConfiguration.cs
@@ -22,7 +22,7 @@ public virtual string Name
 
         public virtual IReport CreateSessionReport()
         {
-            if (ReportingAppXmlConfiguration.Instance.PublishTestReports)
+            if (ReportingConfigurationLocator.Get().PublishTestReports)
                 return new SessionReport(archiveLocation, name);
             return new NullSessionReport();
         }
diff --git a/src/TestStack.White.ScreenObjects/TestStack.White.ScreenObjects.csproj b/src/TestStack.White.ScreenObjects/TestStack.White.ScreenObjects.csproj
index f86f229f..2b40f14c 100644
--- a/src/TestStack.White.ScreenObjects/TestStack.White.ScreenObjects.csproj
+++ b/src/TestStack.White.ScreenObjects/TestStack.White.ScreenObjects.csproj
@@ -83,11 +83,11 @@
     <Compile Include="AppScreenComponent.cs" />
     <Compile Include="AppScreenException.cs" />
     <Compile Include="AppWindow.cs" />
+    <Compile Include="Configuration\RepositoryConfigurationLocator.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ScreenAttributes\AutomationIdAttribute.cs" />
     <Compile Include="ScreenAttributes\FrameworkIdAttribute.cs" />
     <Compile Include="ScreenAttributes\IndexAttribute.cs" />
-    <Compile Include="Configuration\RepositoryAppXmlConfiguration.cs" />
     <Compile Include="Configuration\RepositoryConfiguration.cs" />
     <Compile Include="EntityMapping\Entities.cs" />
     <Compile Include="EntityMapping\Entity.cs" />
diff --git a/src/TestStack.White.UITests/AutomationElementSearch/RawAutomationElementFinderTests.cs b/src/TestStack.White.UITests/AutomationElementSearch/RawAutomationElementFinderTests.cs
index 8ec3d2ac..3ea840b3 100644
--- a/src/TestStack.White.UITests/AutomationElementSearch/RawAutomationElementFinderTests.cs
+++ b/src/TestStack.White.UITests/AutomationElementSearch/RawAutomationElementFinderTests.cs
@@ -21,7 +21,7 @@ public RawAutomationElementFinderTests(WindowsFramework framework)
         [OneTimeSetUp]
         public void Setup()
         {
-            cleanup = CoreAppXmlConfiguration.Instance.ApplyTemporarySetting(c =>
+            cleanup = CoreConfigurationLocator.Get().ApplyTemporarySettings(c =>
             {
                 c.RawElementBasedSearch = true;
                 c.MaxElementSearchDepth = 2;
diff --git a/src/TestStack.White.UITests/ControlTests/ButtonTests.cs b/src/TestStack.White.UITests/ControlTests/ButtonTests.cs
index 5652325b..48a11f03 100644
--- a/src/TestStack.White.UITests/ControlTests/ButtonTests.cs
+++ b/src/TestStack.White.UITests/ControlTests/ButtonTests.cs
@@ -25,7 +25,7 @@ public void Click()
         [Test]
         public void ThrowsWhenNotFound()
         {
-            using (CoreAppXmlConfiguration.Instance.ApplyTemporarySetting(c => c.FindWindowTimeout = 500))
+            using (CoreConfigurationLocator.Get().ApplyTemporarySettings(c => c.FindWindowTimeout = 500))
             {
                 Assert.That(() => { MainWindow.Get<Button>(SearchCriteria.ByAutomationId("foo")); },
                     Throws.TypeOf<AutomationException>().With.
diff --git a/src/TestStack.White.UITests/ControlTests/ListControls/ComboBoxTests.cs b/src/TestStack.White.UITests/ControlTests/ListControls/ComboBoxTests.cs
index 1d7e9de3..9ad7981a 100644
--- a/src/TestStack.White.UITests/ControlTests/ListControls/ComboBoxTests.cs
+++ b/src/TestStack.White.UITests/ControlTests/ListControls/ComboBoxTests.cs
@@ -36,7 +36,7 @@ public void ListItemInComboBoxWithoutTextAvailableInitiallyTest()
             Restart();
             ComboBoxUnderTest = MainWindow.Get<ComboBox>(SearchCriteria.ByAutomationId("AComboBox"));
 
-            var config = CoreAppXmlConfiguration.Instance;
+            var config = CoreConfigurationLocator.Get();
             var originalVal = config.ComboBoxItemsPopulatedWithoutDropDownOpen;
             try
             {
@@ -53,7 +53,7 @@ public void ListItemInComboBoxWithoutTextAvailableInitiallyTest()
         public void ComboBoxOnlyCollapsesWhenExpansionWasForItemRetrievalTest()
         {
             // Arrange
-            var config = CoreAppXmlConfiguration.Instance;
+            var config = CoreConfigurationLocator.Get();
             var originalVal = config.ComboBoxItemsPopulatedWithoutDropDownOpen;
             config.ComboBoxItemsPopulatedWithoutDropDownOpen = false;
 
@@ -82,7 +82,7 @@ public void ComboBoxOnlyCollapsesWhenExpansionWasForItemRetrievalTest()
         public void ComboBoxWithAutoExpandCollapsedOnceItemsAreRetrievedTest()
         {
             // Arrange
-            var config = CoreAppXmlConfiguration.Instance;
+            var config = CoreConfigurationLocator.Get();
             var originalVal = config.ComboBoxItemsPopulatedWithoutDropDownOpen;
             config.ComboBoxItemsPopulatedWithoutDropDownOpen = false;
             try
diff --git a/src/TestStack.White.UITests/ControlTests/ListControls/DataBoundComboBoxTests.cs b/src/TestStack.White.UITests/ControlTests/ListControls/DataBoundComboBoxTests.cs
index 580c093f..da84adf9 100644
--- a/src/TestStack.White.UITests/ControlTests/ListControls/DataBoundComboBoxTests.cs
+++ b/src/TestStack.White.UITests/ControlTests/ListControls/DataBoundComboBoxTests.cs
@@ -18,7 +18,7 @@ public void CanSelectDataboundItemsTest()
         {
             var comboBoxUnderTest = MainWindow.Get<ComboBox>("DataBoundComboBox");
             ListItems items;
-            CoreAppXmlConfiguration.Instance.ComboBoxItemsPopulatedWithoutDropDownOpen = false;
+            CoreConfigurationLocator.Get().ComboBoxItemsPopulatedWithoutDropDownOpen = false;
             try
             {
                 items = comboBoxUnderTest.Items;
@@ -26,7 +26,7 @@ public void CanSelectDataboundItemsTest()
             }
             finally
             {
-                CoreAppXmlConfiguration.Instance.ComboBoxItemsPopulatedWithoutDropDownOpen = true;
+                CoreConfigurationLocator.Get().ComboBoxItemsPopulatedWithoutDropDownOpen = true;
             }
             items = comboBoxUnderTest.Items;
             Assert.That(items, Has.Count.EqualTo(5));
diff --git a/src/TestStack.White.UITests/ControlTests/ListControls/ListBoxWithScrollBarTests.cs b/src/TestStack.White.UITests/ControlTests/ListControls/ListBoxWithScrollBarTests.cs
index 9a18f026..41c9bb4c 100644
--- a/src/TestStack.White.UITests/ControlTests/ListControls/ListBoxWithScrollBarTests.cs
+++ b/src/TestStack.White.UITests/ControlTests/ListControls/ListBoxWithScrollBarTests.cs
@@ -51,7 +51,7 @@ public void FindNonExistentObjectTest()
             }
             var listBox = MainWindow.Get<ListBox>("ListBoxWpf");
             var listItem = (WPFListItem)listBox.Items.Find(item => item.Text.StartsWith("Hrishikesh"));
-            using (CoreAppXmlConfiguration.Instance.ApplyTemporarySetting(c => c.BusyTimeout = 100))
+            using (CoreConfigurationLocator.Get().ApplyTemporarySettings(c => c.BusyTimeout = 100))
             {
                 Assert.That(() => { listItem.Get<TextBox>(SearchCriteria.ByAutomationId("foo")); },
                     Throws.TypeOf<AutomationException>().With.Message.EqualTo(
diff --git a/src/TestStack.White.UITests/ControlTests/PropertyGridTests.cs b/src/TestStack.White.UITests/ControlTests/PropertyGridTests.cs
index acd869e9..ebd91892 100644
--- a/src/TestStack.White.UITests/ControlTests/PropertyGridTests.cs
+++ b/src/TestStack.White.UITests/ControlTests/PropertyGridTests.cs
@@ -36,7 +36,7 @@ public void CategoriesTest()
             Assert.That(categories, Has.Exactly(1).Matches<PropertyGridCategory>(c => c.Text == "General"));
             Assert.That(categories, Has.Exactly(1).Matches<PropertyGridCategory>(c => c.Text == "Input"));
             Assert.That(categories, Has.Exactly(1).Matches<PropertyGridCategory>(c => c.Text == "Number"));
-            Assert.That(categories, Has.Exactly(1).Matches<PropertyGridCategory>(c => c.Text == UIItemIdAppXmlConfiguration.Instance.PropertyGridMiscText));
+            Assert.That(categories, Has.Exactly(1).Matches<PropertyGridCategory>(c => c.Text == UIItemIdConfigurationLocator.Get().PropertyGridMiscText));
         }
 
         [Test]
@@ -45,7 +45,7 @@ public void BrowseForValueTest()
             var propertyGridCategory = propertyGrid.Category("Input");
             var property = propertyGridCategory.GetProperty("FileName");
             property.BrowseForValue();
-            MainWindow.ModalWindow(UIItemIdAppXmlConfiguration.Instance.OpenFileDialogTitle).Close();
+            MainWindow.ModalWindow(UIItemIdConfigurationLocator.Get().OpenFileDialogTitle).Close();
         }
 
         [Test]
@@ -59,7 +59,7 @@ public void CannotBrowseForValueTest()
         public void PropertiesTest()
         {
             Assert.That(propertyGrid.Category("General").Properties, Has.Count.EqualTo(3));
-            Assert.That(propertyGrid.Category(UIItemIdAppXmlConfiguration.Instance.PropertyGridMiscText).Properties, Has.Count.EqualTo(2));
+            Assert.That(propertyGrid.Category(UIItemIdConfigurationLocator.Get().PropertyGridMiscText).Properties, Has.Count.EqualTo(2));
             Assert.That(propertyGrid.Category("Number").Properties, Has.Count.EqualTo(2));
         }
 
diff --git a/src/TestStack.White.UITests/ControlTests/WindowStripControls/StatusStripTests.cs b/src/TestStack.White.UITests/ControlTests/WindowStripControls/StatusStripTests.cs
index cb130530..1a7b4e8d 100644
--- a/src/TestStack.White.UITests/ControlTests/WindowStripControls/StatusStripTests.cs
+++ b/src/TestStack.White.UITests/ControlTests/WindowStripControls/StatusStripTests.cs
@@ -34,7 +34,7 @@ public void FindTest()
         [Test]
         public void ThrowsWhenDoesNotExistsTest()
         {
-            using (CoreAppXmlConfiguration.Instance.ApplyTemporarySetting(c => c.BusyTimeout = 100))
+            using (CoreConfigurationLocator.Get().ApplyTemporarySettings(c => c.BusyTimeout = 100))
             {
                 Assert.That(() => { MainWindow.Get<StatusStrip>("foo"); },
                     Throws.TypeOf<AutomationException>().With.
diff --git a/src/TestStack.White.UITests/Infrastructure/SilverlightTestConfiguration.cs b/src/TestStack.White.UITests/Infrastructure/SilverlightTestConfiguration.cs
index 56dca379..bd9d1ecb 100644
--- a/src/TestStack.White.UITests/Infrastructure/SilverlightTestConfiguration.cs
+++ b/src/TestStack.White.UITests/Infrastructure/SilverlightTestConfiguration.cs
@@ -46,7 +46,7 @@ public override Application LaunchApplication()
             var addArgs = string.Format("add app /site.name:\"Default Web Site\" /path:/TestSilverlightApplication.Web /physicalPath:\"{0}\"", fullPath);
             const string deleteArgs = "delete app /app.name:\"Default Web Site\\TestSilverlightApplication.Web\"";
 
-            var logger = CoreAppXmlConfiguration.Instance.LoggerFactory.Create(typeof(SilverlightTestConfiguration));
+            var logger = CoreConfigurationLocator.Get().LoggerFactory.Create(typeof(SilverlightTestConfiguration));
             logger.Info(string.Format("Running {0} {1}", appcmd, deleteArgs));
             Process.Start(appcmd, deleteArgs).WaitForExit();
             logger.Info(string.Format("Running {0} {1}", appcmd, addArgs));
diff --git a/src/TestStack.White.UITests/MessageBoxTests.cs b/src/TestStack.White.UITests/MessageBoxTests.cs
index c41191d5..425d229e 100644
--- a/src/TestStack.White.UITests/MessageBoxTests.cs
+++ b/src/TestStack.White.UITests/MessageBoxTests.cs
@@ -35,7 +35,7 @@ public void ClickButtonOnMessageBoxTest()
         [Test]
         public void ThrowsWhenNotFoundTest()
         {
-            using (CoreAppXmlConfiguration.Instance.ApplyTemporarySetting(c => c.FindWindowTimeout = 500))
+            using (CoreConfigurationLocator.Get().ApplyTemporarySettings(c => c.FindWindowTimeout = 500))
             {
                 Assert.That(() => { MainWindow.MessageBox("foo"); },
                    Throws.TypeOf<AutomationException>().With.Message.EqualTo("Could not find modal window with title: foo"));
diff --git a/src/TestStack.White.UITests/ModalWindowTests.cs b/src/TestStack.White.UITests/ModalWindowTests.cs
index 988694b0..35fb0fd6 100644
--- a/src/TestStack.White.UITests/ModalWindowTests.cs
+++ b/src/TestStack.White.UITests/ModalWindowTests.cs
@@ -45,7 +45,7 @@ public void GetControlFromModalWindowWhenSessionActiveTest()
         [Test]
         public void ThrowsWhenNotFoundTest()
         {
-            using (CoreAppXmlConfiguration.Instance.ApplyTemporarySetting(s => s.FindWindowTimeout = 1000))
+            using (CoreConfigurationLocator.Get().ApplyTemporarySettings(s => s.FindWindowTimeout = 1000))
             {
                 Assert.That(() => { MainWindow.ModalWindow("foo"); },
                    Throws.TypeOf<AutomationException>().With.Message.EqualTo("Could not find modal window with title: foo"));
diff --git a/src/TestStack.White.UITests/WhiteUITestBase.cs b/src/TestStack.White.UITests/WhiteUITestBase.cs
index 85b0f43c..55b4b290 100644
--- a/src/TestStack.White.UITests/WhiteUITestBase.cs
+++ b/src/TestStack.White.UITests/WhiteUITestBase.cs
@@ -24,7 +24,7 @@ public abstract class WhiteUITestBase
         protected WhiteUITestBase(WindowsFramework framework)
         {
             Framework = framework;
-            CoreAppXmlConfiguration.Instance.LoggerFactory = new ConsoleFactory(LoggerLevel.Debug);
+            CoreConfigurationLocator.Get().LoggerFactory = new ConsoleFactory(LoggerLevel.Debug);
             screenshotDir = @"c:\FailedTestsScreenshots";
             Directory.CreateDirectory(screenshotDir);
         }
@@ -50,7 +50,7 @@ public void BaseTestTeardown()
             }
         }
 
-        readonly ILogger logger = CoreAppXmlConfiguration.Instance.LoggerFactory.Create(typeof(WhiteUITestBase));
+        readonly ILogger logger = CoreConfigurationLocator.Get().LoggerFactory.Create(typeof(WhiteUITestBase));
         readonly List<Window> windowsToClose = new List<Window>();
         readonly string screenshotDir;
 
diff --git a/src/TestStack.White.UITests/WindowTests.cs b/src/TestStack.White.UITests/WindowTests.cs
index 9891852f..4a8102c6 100644
--- a/src/TestStack.White.UITests/WindowTests.cs
+++ b/src/TestStack.White.UITests/WindowTests.cs
@@ -1,5 +1,5 @@
-using System;
 using NUnit.Framework;
+using System;
 using System.Diagnostics;
 using System.Linq;
 using System.Windows.Automation;
@@ -95,7 +95,7 @@ public void HandlesInvisibleControlsWinformsTest()
             {
                 Assert.Ignore();
             }
-            using (CoreAppXmlConfiguration.Instance.ApplyTemporarySetting(c => c.BusyTimeout = 100))
+            using (CoreConfigurationLocator.Get().ApplyTemporarySettings(c => c.BusyTimeout = 100))
             {
                 Assert.That(() => { MainWindow.Get<TextBox>("HiddenTextBox"); },
                     Throws.TypeOf<AutomationException>().With.Message.EqualTo(
@@ -126,7 +126,7 @@ public void FindToolBarsWhenThereAreMultipleTest()
         {
             Assert.That(MainWindow.GetToolStrip("ToolStrip1"), Is.Not.Null);
             Assert.That(MainWindow.GetToolStrip("ToolStrip2"), Is.Not.Null);
-            using (CoreAppXmlConfiguration.Instance.ApplyTemporarySetting(c => c.BusyTimeout = 100))
+            using (CoreConfigurationLocator.Get().ApplyTemporarySettings(c => c.BusyTimeout = 100))
             {
                 Assert.That(() => { MainWindow.GetToolStrip("ToolStrip3"); },
                     Throws.TypeOf<AutomationException>().With.Message.EqualTo(
@@ -167,7 +167,7 @@ public void GetTitleTest()
         public void HandleDynamicallyAddedControlsTest()
         {
             SelectOtherControls();
-            using (CoreAppXmlConfiguration.Instance.ApplyTemporarySetting(c => c.BusyTimeout = 100))
+            using (CoreConfigurationLocator.Get().ApplyTemporarySettings(c => c.BusyTimeout = 100))
             {
                 Assert.That(() => { MainWindow.Get<TextBox>("AddedTextBox"); },
                     Throws.TypeOf<AutomationException>());
diff --git a/src/TestStack.White.WebBrowser.UITests/SilverlightTestFixture.cs b/src/TestStack.White.WebBrowser.UITests/SilverlightTestFixture.cs
index 1aaba0cc..c7e354b4 100644
--- a/src/TestStack.White.WebBrowser.UITests/SilverlightTestFixture.cs
+++ b/src/TestStack.White.WebBrowser.UITests/SilverlightTestFixture.cs
@@ -34,7 +34,7 @@ protected SilverlightTestFixture()
             var addArgs = string.Format("add app /site.name:\"Default Web Site\" /path:/TestSilverlightApplication.Web /physicalPath:\"{0}\"", fullPath); 
             const string deleteArgs = "delete app /app.name:\"Default Web Site\\TestSilverlightApplication.Web\"";
             
-            var logger = CoreAppXmlConfiguration.Instance.LoggerFactory.Create(typeof (SilverlightTestFixture));
+            var logger = CoreConfigurationLocator.Get().LoggerFactory.Create(typeof (SilverlightTestFixture));
             logger.Info(string.Format("Running {0} {1}", appcmd, deleteArgs));
             Process.Start(appcmd, deleteArgs).WaitForExit();
             logger.Info(string.Format("Running {0} {1}", appcmd, addArgs));
diff --git a/src/TestStack.White.WebBrowser/BrowserWindow.cs b/src/TestStack.White.WebBrowser/BrowserWindow.cs
index d2e0d04b..2752f462 100644
--- a/src/TestStack.White.WebBrowser/BrowserWindow.cs
+++ b/src/TestStack.White.WebBrowser/BrowserWindow.cs
@@ -3,6 +3,7 @@
 using TestStack.White.Configuration;
 using TestStack.White.Factory;
 using TestStack.White.Sessions;
+using TestStack.White.SystemExtensions;
 using TestStack.White.UIItems.WindowItems;
 using TestStack.White.Utility;
 using TestStack.White.WebBrowser.Silverlight;
@@ -34,12 +35,12 @@ public virtual SilverlightDocument SilverlightDocument
 
                             return finder.Descendant(automationSearchCondition);
                         },
-                        CoreAppXmlConfiguration.Instance.BusyTimeout());
+                        CoreConfigurationLocator.Get().BusyTimeout.AsTimeSpan());
 
                     if (silverlightControl == null)
                     {
                         var message = string.Format("Could not find Silverlight document after waiting for {0}. " +
-                            "Timeout value configured by BusyTimeout in White/Core", CoreAppXmlConfiguration.Instance.BusyTimeout);
+                            "Timeout value configured by BusyTimeout in White/Core", CoreConfigurationLocator.Get().BusyTimeout);
                         throw new UIItemSearchException(message);
                     }
 
diff --git a/src/TestStack.White.WebBrowser/Config/WebBrowserAppXmlConfiguration.cs b/src/TestStack.White.WebBrowser/Config/WebBrowserAppXmlConfiguration.cs
deleted file mode 100644
index 590efae5..00000000
--- a/src/TestStack.White.WebBrowser/Config/WebBrowserAppXmlConfiguration.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using System.Collections.Generic;
-using TestStack.White.Bricks;
-using TestStack.White.Configuration;
-
-namespace TestStack.White.WebBrowser.Config
-{
-    public class WebBrowserAppXmlConfiguration : AssemblyConfiguration, WebBrowserConfiguration
-    {
-        private static readonly Dictionary<string, object> DefaultValues = new Dictionary<string, object>();
-        private static WebBrowserConfiguration instance;
-
-        static WebBrowserAppXmlConfiguration()
-        {
-            DefaultValues.Add("FirefoxSingleWindowCheckWait", 2000);
-        }
-
-        private WebBrowserAppXmlConfiguration() : base("White", "WebBrowser", DefaultValues, 
-            CoreAppXmlConfiguration.Instance.LoggerFactory.Create(typeof(WebBrowserAppXmlConfiguration))){}
-
-        public static WebBrowserConfiguration Instance
-        {
-            get { return instance ?? (instance = new WebBrowserAppXmlConfiguration()); }
-        }
-
-        public virtual int FirefoxSingleWindowCheckWait
-        {
-            get { return Convert.ToInt32(UsedValues["FirefoxSingleWindowCheckWait"]); }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/TestStack.White.WebBrowser/Config/WebBrowserConfiguration.cs b/src/TestStack.White.WebBrowser/Config/WebBrowserConfiguration.cs
deleted file mode 100644
index 0f1ebf1c..00000000
--- a/src/TestStack.White.WebBrowser/Config/WebBrowserConfiguration.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace TestStack.White.WebBrowser.Config
-{
-    public interface WebBrowserConfiguration
-    {
-        int FirefoxSingleWindowCheckWait { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/TestStack.White.WebBrowser/Configuration/WebBrowserConfiguration.cs b/src/TestStack.White.WebBrowser/Configuration/WebBrowserConfiguration.cs
new file mode 100644
index 00000000..3b15eacc
--- /dev/null
+++ b/src/TestStack.White.WebBrowser/Configuration/WebBrowserConfiguration.cs
@@ -0,0 +1,27 @@
+using System.Collections.Generic;
+using TestStack.White.Configuration;
+
+namespace TestStack.White.WebBrowser.Configuration
+{
+    public class WebBrowserConfiguration : ConfigurationBase<WebBrowserConfiguration>
+    {
+        private const string FirefoxSingleWindowCheckWaitKey = "FirefoxSingleWindowCheckWait";
+
+        public override Dictionary<string, object> DefaultValues
+        {
+            get
+            {
+                return new Dictionary<string, object>
+                {
+                    {FirefoxSingleWindowCheckWaitKey, 2000}
+                };
+            }
+        }
+
+        public virtual int FirefoxSingleWindowCheckWait
+        {
+            get { return GetValueInt32(FirefoxSingleWindowCheckWaitKey); }
+            set { SetValue(FirefoxSingleWindowCheckWaitKey, value); }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/TestStack.White.WebBrowser/Configuration/WebBrowserConfigurationLocator.cs b/src/TestStack.White.WebBrowser/Configuration/WebBrowserConfigurationLocator.cs
new file mode 100644
index 00000000..155f10f5
--- /dev/null
+++ b/src/TestStack.White.WebBrowser/Configuration/WebBrowserConfigurationLocator.cs
@@ -0,0 +1,24 @@
+using TestStack.White.Configuration.Readers;
+
+namespace TestStack.White.WebBrowser.Configuration
+{
+    public static class WebBrowserConfigurationLocator
+    {
+        private static WebBrowserConfiguration webBrowserConfiguration;
+
+        public static WebBrowserConfiguration Get()
+        {
+            if (webBrowserConfiguration == null)
+            {
+                Set(new AppConfigReader("White", "WebBrowser"));
+            }
+            return webBrowserConfiguration;
+        }
+
+        public static void Set(IConfigurationReader configurationReader)
+        {
+            webBrowserConfiguration = new WebBrowserConfiguration();
+            configurationReader.FillConfigurationFromReader(webBrowserConfiguration);
+        }
+    }
+}
diff --git a/src/TestStack.White.WebBrowser/Firefox.cs b/src/TestStack.White.WebBrowser/Firefox.cs
index 3eed4cdf..9d62765a 100644
--- a/src/TestStack.White.WebBrowser/Firefox.cs
+++ b/src/TestStack.White.WebBrowser/Firefox.cs
@@ -2,7 +2,7 @@
 using System.Diagnostics;
 using System.Threading;
 using TestStack.White.UIItems.WindowItems;
-using TestStack.White.WebBrowser.Config;
+using TestStack.White.WebBrowser.Configuration;
 
 namespace TestStack.White.WebBrowser
 {
@@ -26,7 +26,7 @@ public static FirefoxWindow Launch(string url)
             string commandLine = string.Format("-new-window {0}", url);
             var processStartInfo = new ProcessStartInfo {FileName = executable, Arguments = commandLine};
             Application application = Application.Launch(processStartInfo);
-            Thread.Sleep(WebBrowserAppXmlConfiguration.Instance.FirefoxSingleWindowCheckWait);
+            Thread.Sleep(WebBrowserConfigurationLocator.Get().FirefoxSingleWindowCheckWait);
             int numberOfFirefoxProcessesAfterLaunch = Process.GetProcessesByName(executableName).Length;
             bool processPerWindow = numberOfFirefoxProcessesAfterLaunch > numberBeforeLaunch;
 
diff --git a/src/TestStack.White.WebBrowser/TestStack.White.WebBrowser.csproj b/src/TestStack.White.WebBrowser/TestStack.White.WebBrowser.csproj
index eae72f2c..1271df98 100644
--- a/src/TestStack.White.WebBrowser/TestStack.White.WebBrowser.csproj
+++ b/src/TestStack.White.WebBrowser/TestStack.White.WebBrowser.csproj
@@ -85,13 +85,13 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Configuration\WebBrowserConfigurationLocator.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="FirefoxFactory.cs" />
     <Compile Include="BrowserWindow.cs" />
-    <Compile Include="Config\WebBrowserAppXmlConfiguration.cs" />
     <Compile Include="FirefoxWindow.cs" />
     <Compile Include="Firefox.cs" />
-    <Compile Include="Config\WebBrowserConfiguration.cs" />
+    <Compile Include="Configuration\WebBrowserConfiguration.cs" />
     <Compile Include="InternetExplorerFactory.cs" />
     <Compile Include="InternetExplorerWindow.cs" />
     <Compile Include="InternetExplorer.cs" />
diff --git a/src/TestStack.White/Application.cs b/src/TestStack.White/Application.cs
index 9d7ddbb2..2fa07807 100644
--- a/src/TestStack.White/Application.cs
+++ b/src/TestStack.White/Application.cs
@@ -22,7 +22,7 @@ public class Application : IDisposable
         private readonly Process process;
         private readonly ApplicationSession applicationSession;
         private readonly WindowFactory windowFactory;
-        private static readonly ILogger Logger = CoreAppXmlConfiguration.Instance.LoggerFactory.Create(typeof(Application));
+        private static readonly ILogger Logger = CoreConfigurationLocator.Get().LoggerFactory.Create(typeof(Application));
 
         protected Application()
         {
@@ -299,7 +299,7 @@ public override int GetHashCode()
 
         public virtual void Dispose()
         {
-            if (!CoreAppXmlConfiguration.Instance.KeepOpenOnDispose)
+            if (!CoreConfigurationLocator.Get().KeepOpenOnDispose)
             {
                 Kill();
             }
@@ -315,7 +315,7 @@ public virtual Window FindSplash()
         /// </summary>
         public virtual void WaitWhileBusy()
         {
-            process.WaitForInputIdle(CoreAppXmlConfiguration.Instance.BusyTimeout);
+            process.WaitForInputIdle(CoreConfigurationLocator.Get().BusyTimeout);
         }
 
         /// <summary>
diff --git a/src/TestStack.White/AutomationElementSearch/DescendantFinderFactory.cs b/src/TestStack.White/AutomationElementSearch/DescendantFinderFactory.cs
index 25f14a7b..efdd9e1d 100644
--- a/src/TestStack.White/AutomationElementSearch/DescendantFinderFactory.cs
+++ b/src/TestStack.White/AutomationElementSearch/DescendantFinderFactory.cs
@@ -7,7 +7,7 @@ public class DescendantFinderFactory
     {
         public static IDescendantFinder Create(AutomationElement automationElement)
         {
-            if (CoreAppXmlConfiguration.Instance.RawElementBasedSearch) return new RawAutomationElementFinder(automationElement);
+            if (CoreConfigurationLocator.Get().RawElementBasedSearch) return new RawAutomationElementFinder(automationElement);
             return new DescendantFinder(automationElement);
         }
     }
diff --git a/src/TestStack.White/AutomationElementSearch/RawAutomationElementFinder.cs b/src/TestStack.White/AutomationElementSearch/RawAutomationElementFinder.cs
index a956d68e..ad075c18 100644
--- a/src/TestStack.White/AutomationElementSearch/RawAutomationElementFinder.cs
+++ b/src/TestStack.White/AutomationElementSearch/RawAutomationElementFinder.cs
@@ -11,7 +11,7 @@ public class RawAutomationElementFinder : IDescendantFinder
     {
         private readonly AutomationElement automationElement;
         private static readonly TreeWalker RawViewWalker = TreeWalker.RawViewWalker;
-        private readonly ILogger logger = CoreAppXmlConfiguration.Instance.LoggerFactory.Create(typeof(RawAutomationElementFinder));
+        private readonly ILogger logger = CoreConfigurationLocator.Get().LoggerFactory.Create(typeof(RawAutomationElementFinder));
 
         public RawAutomationElementFinder(AutomationElement automationElement)
         {
@@ -26,7 +26,7 @@ public virtual AutomationElement Child(AutomationSearchCondition automationSearc
         public virtual AutomationElement Descendant(AutomationSearchCondition automationSearchCondition)
         {
             return
-                FindAll(automationSearchCondition, ElementSearchResult.ForOne(), CoreAppXmlConfiguration.Instance.MaxElementSearchDepth).Elements.FirstOrDefault
+                FindAll(automationSearchCondition, ElementSearchResult.ForOne(), CoreConfigurationLocator.Get().MaxElementSearchDepth).Elements.FirstOrDefault
                     ();
         }
 
@@ -37,7 +37,7 @@ public virtual AutomationElement Descendant(Condition condition)
 
         public virtual List<AutomationElement> Descendants(AutomationSearchCondition automationSearchCondition)
         {
-            return FindAll(automationSearchCondition, ElementSearchResult.ForMany(), CoreAppXmlConfiguration.Instance.MaxElementSearchDepth).Elements;
+            return FindAll(automationSearchCondition, ElementSearchResult.ForMany(), CoreConfigurationLocator.Get().MaxElementSearchDepth).Elements;
         }
 
         private ElementSearchResult FindAll(AutomationSearchCondition automationSearchCondition, ElementSearchResult elementSearchResult, int depth)
diff --git a/src/TestStack.White/Bricks/AssemblyConfiguration.cs b/src/TestStack.White/Bricks/AssemblyConfiguration.cs
deleted file mode 100644
index 0fb34550..00000000
--- a/src/TestStack.White/Bricks/AssemblyConfiguration.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Configuration;
-using Castle.Core.Logging;
-
-namespace TestStack.White.Bricks
-{
-    public class AssemblyConfiguration
-    {
-        protected readonly Dictionary<string, string> UsedValues = new Dictionary<string, string>();
-
-        protected AssemblyConfiguration() { }
-
-        protected AssemblyConfiguration(string sectionGroup, string sectionName, Dictionary<string, object> defaultValues, ILogger logger)
-        {
-            var nameValues = (NameValueCollection)ConfigurationManager.GetSection(sectionGroup + "/" + sectionName);
-            if (logger == null) logger = new TraceLogger(typeof (AssemblyConfiguration).Name);
-            if (nameValues == null)
-            {
-                nameValues = new NameValueCollection();
-            }
-            CreateConfiguration(defaultValues, nameValues);
-            foreach (KeyValuePair<string, string> pair in UsedValues)
-                logger.InfoFormat("Using {0}={1} for {2}/{3}", pair.Key, pair.Value, sectionGroup, sectionName);
-        }
-
-        protected AssemblyConfiguration(Dictionary<string, object> defaultValues, ILogger logger)
-        {
-            NameValueCollection nameValues = ConfigurationManager.AppSettings;
-            CreateConfiguration(defaultValues, nameValues);
-            foreach (KeyValuePair<string, string> pair in UsedValues)
-                logger.InfoFormat("Using {0}={1}", pair.Key, pair.Value);
-        }
-
-        private void CreateConfiguration(Dictionary<string, object> defaultValues, NameValueCollection nameValues)
-        {
-            foreach (KeyValuePair<string, object> pair in defaultValues)
-                UsedValues.Add(pair.Key, pair.Value.ToString());
-            foreach (string key in nameValues.AllKeys)
-            {
-                string value = nameValues.Get(key);
-                if (value != null)
-                {
-                    UsedValues.Remove(key);
-                    UsedValues[key] = value;
-                }
-            }
-
-            var allKeys = new List<string>(nameValues.AllKeys);
-            allKeys.AddRange(defaultValues.Keys);
-
-            foreach (string key in allKeys)
-            {
-                string value = ConfigurationManager.AppSettings[key];
-                if (value != null)
-                {
-                    UsedValues.Remove(key);
-                    UsedValues[key] = value;
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/TestStack.White/Configuration/ConfigurationBase.cs b/src/TestStack.White/Configuration/ConfigurationBase.cs
new file mode 100644
index 00000000..a8e888a3
--- /dev/null
+++ b/src/TestStack.White/Configuration/ConfigurationBase.cs
@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using TestStack.White.Utility;
+
+namespace TestStack.White.Configuration
+{
+    /// <summary>
+    /// Base class for configurations
+    /// </summary>
+    public abstract class ConfigurationBase<T> : IConfiguration where T : ConfigurationBase<T>
+    {
+        /// <summary>
+        /// Dictionary which holds the current values
+        /// </summary>
+        protected readonly Dictionary<string, string> ConfigurationValues = new Dictionary<string, string>();
+
+        protected ConfigurationBase()
+        {
+            // Initialize with default values
+            foreach (var kvp in DefaultValues)
+            {
+                SetValue(kvp.Key, kvp.Value);
+            }
+        }
+
+        /// <summary>
+        /// Temporarily override some configuration values
+        /// </summary>
+        public virtual IDisposable ApplyTemporarySettings(Action<T> changes)
+        {
+            var existing = new Dictionary<string, string>(ConfigurationValues);
+            changes((T)this);
+
+            return new DelegateDisposable(() =>
+            {
+                foreach (var value in existing)
+                {
+                    SetValue(value.Key, value.Value);
+                }
+            });
+        }
+
+        /// <summary>
+        /// Set the value for the given key
+        /// </summary>
+        public virtual void SetValue(string key, object value)
+        {
+            ConfigurationValues[key] = value.ToString();
+        }
+
+        /// <summary>
+        /// Get the value for the given key
+        /// </summary>
+        public virtual string GetValue(string key)
+        {
+            return ConfigurationValues[key];
+        }
+
+        /// <summary>
+        /// Get the value converted to int32 for the given key
+        /// </summary>
+        protected virtual int GetValueInt32(string key)
+        {
+            return Convert.ToInt32(GetValue(key));
+        }
+
+        /// <summary>
+        /// Get the value converted to boolean for the given key
+        /// </summary>
+        protected virtual bool GetValueBoolean(string key)
+        {
+            return Convert.ToBoolean(GetValue(key));
+        }
+
+        /// <summary>
+        /// Dictionary with the default values
+        /// </summary>
+        public abstract Dictionary<string, object> DefaultValues { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/TestStack.White/Configuration/ConfigurationExtensions.cs b/src/TestStack.White/Configuration/ConfigurationExtensions.cs
deleted file mode 100644
index a1baf3c4..00000000
--- a/src/TestStack.White/Configuration/ConfigurationExtensions.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-
-namespace TestStack.White.Configuration
-{
-    /// <summary>
-    /// Used to ensure backwards compatibility
-    /// </summary>
-    public static class ConfigurationExtensions
-    {
-        public static TimeSpan TooltipWaitTimeSpan(this ICoreConfiguration coreConfiguration)
-        {
-            return TimeSpan.FromMilliseconds(coreConfiguration.TooltipWaitTime);
-        }
-
-        public static TimeSpan BusyTimeout(this ICoreConfiguration coreConfiguration)
-        {
-            return TimeSpan.FromMilliseconds(coreConfiguration.BusyTimeout);
-        }
-
-        public static TimeSpan FindWindowTimeout(this ICoreConfiguration coreConfiguration)
-        {
-            return TimeSpan.FromMilliseconds(coreConfiguration.FindWindowTimeout);
-        }
-
-        public static TimeSpan SuggestionListTimeout(this ICoreConfiguration coreConfiguration)
-        {
-            return TimeSpan.FromMilliseconds(coreConfiguration.SuggestionListTimeout);
-        }
-
-        public static TimeSpan UIAutomationZeroWindowBugTimeout(this ICoreConfiguration coreConfiguration)
-        {
-            return TimeSpan.FromMilliseconds(coreConfiguration.UIAutomationZeroWindowBugTimeout);
-        }
-
-        public static TimeSpan PopupTimeout(this ICoreConfiguration coreConfiguration)
-        {
-            return TimeSpan.FromMilliseconds(coreConfiguration.UIAutomationZeroWindowBugTimeout);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/TestStack.White/Configuration/CoreAppXmlConfiguration.cs b/src/TestStack.White/Configuration/CoreAppXmlConfiguration.cs
deleted file mode 100644
index 861734bf..00000000
--- a/src/TestStack.White/Configuration/CoreAppXmlConfiguration.cs
+++ /dev/null
@@ -1,206 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Castle.Core.Logging;
-using TestStack.White.Bricks;
-using TestStack.White.Interceptors;
-using TestStack.White.UIItems;
-using TestStack.White.Utility;
-
-namespace TestStack.White.Configuration
-{
-    public class CoreAppXmlConfiguration : AssemblyConfiguration, ICoreConfiguration
-    {
-        private static ICoreConfiguration instance;
-        private readonly DynamicProxyInterceptors interceptors = new DynamicProxyInterceptors();
-        private static readonly Dictionary<string, object> DefaultValues = new Dictionary<string, object>();
-
-        static CoreAppXmlConfiguration()
-        {
-            DefaultValues.Add("BusyTimeout", 5000);
-            DefaultValues.Add("FindWindowTimeout", 30000);
-            DefaultValues.Add("WaitBasedOnHourGlass", true);
-            DefaultValues.Add("WorkSessionLocation", ".");
-            DefaultValues.Add("UIAutomationZeroWindowBugTimeout", 5000);
-            DefaultValues.Add("PopupTimeout", 5000);
-            DefaultValues.Add("TooltipWaitTime", 3000);
-            DefaultValues.Add("SuggestionListTimeout", 3000);
-            DefaultValues.Add("HighlightTimeout", 1000);
-            DefaultValues.Add("DefaultDateFormat", DateFormat.CultureDefault.ToString());
-            DefaultValues.Add("DragStepCount", 1);
-            DefaultValues.Add("InProc", false);
-            DefaultValues.Add("ComboBoxItemsPopulatedWithoutDropDownOpen", false);
-            DefaultValues.Add("ComboBoxItemSelectionTimeout", 1000);
-            DefaultValues.Add("RawInputQueueProcessingTime", 50);
-            DefaultValues.Add("RawElementBasedSearch", false);
-            DefaultValues.Add("MaxElementSearchDepth", 10);
-            DefaultValues.Add("DoubleClickInterval", 0);
-            DefaultValues.Add("MoveMouseToGetStatusOfHourGlass", true);
-            DefaultValues.Add("KeepOpenOnDispose", false);
-        }
-
-        public static ICoreConfiguration Instance
-        {
-            get { return instance ?? (instance = new CoreAppXmlConfiguration()); }
-        }
-
-        private CoreAppXmlConfiguration()
-            : base("White", "Core", DefaultValues, new TraceLogger(typeof(CoreAppXmlConfiguration).Name))
-        {
-            interceptors.Add(new FocusInterceptor());
-            interceptors.Add(new ScrollInterceptor());
-            LoggerFactory = new WhiteDefaultLoggerFactory(LoggerLevel.Info);
-        }
-
-        public virtual ILoggerFactory LoggerFactory { get; set; }
-
-        public virtual IDisposable ApplyTemporarySetting(Action<ICoreConfiguration> changes)
-        {
-            var existing = new Dictionary<string, string>(UsedValues);
-            changes(this);
-
-            return new DelegateDisposable(() =>
-            {
-                foreach (var value in existing)
-                {
-                    SetUsedValue(value.Key, value.Value);
-                }
-            });
-        }
-
-        private void SetUsedValue(string key, object value)
-        {
-            UsedValues[key] = value.ToString();
-        }
-
-        public virtual IWaitHook AdditionalWaitHook { get; set; }
-
-        public virtual DynamicProxyInterceptors Interceptors
-        {
-            get { return interceptors; }
-        }
-
-        public virtual int BusyTimeout
-        {
-            get { return Convert.ToInt32(UsedValues["BusyTimeout"]); }
-            set { SetUsedValue("BusyTimeout", value); }
-        }
-
-        public virtual int FindWindowTimeout
-        {
-            get { return Convert.ToInt32(UsedValues["FindWindowTimeout"]); }
-            set { SetUsedValue("FindWindowTimeout", value); }
-        }
-
-        public virtual bool WaitBasedOnHourGlass
-        {
-            get { return Convert.ToBoolean(UsedValues["WaitBasedOnHourGlass"]); }
-            set { SetUsedValue("WaitBasedOnHourGlass", value); }
-        }
-
-        public virtual DirectoryInfo WorkSessionLocation
-        {
-            get { return new DirectoryInfo(UsedValues["WorkSessionLocation"]); }
-            set { SetUsedValue("WorkSessionLocation", value); }
-        }
-
-        public virtual int UIAutomationZeroWindowBugTimeout
-        {
-            get { return Convert.ToInt32(UsedValues["UIAutomationZeroWindowBugTimeout"]); }
-            set { SetUsedValue("UIAutomationZeroWindowBugTimeout", value); }
-        }
-
-        public virtual int PopupTimeout
-        {
-            get { return Convert.ToInt32(UsedValues["PopupTimeout"]); }
-            set { SetUsedValue("PopupTimeout", value); }
-        }
-
-        public virtual int TooltipWaitTime
-        {
-            get { return Convert.ToInt32(UsedValues["TooltipWaitTime"]); }
-            set { SetUsedValue("TooltipWaitTime", value); }
-        }
-
-        public virtual int SuggestionListTimeout
-        {
-            get { return Convert.ToInt32(UsedValues["SuggestionListTimeout"]); }
-            set { SetUsedValue("SuggestionListTimeout", value); }
-        }
-
-        public virtual int HighlightTimeout
-        {
-            get { return Convert.ToInt32(UsedValues["HighlightTimeout"]); }
-            set { SetUsedValue("HighlightTimeout", value); }
-        }
-
-        public virtual DateFormat DefaultDateFormat
-        {
-            get { return DateFormat.Parse(UsedValues["DefaultDateFormat"]); }
-            set { UsedValues["DefaultDateFormat"] = value.ToString(); }
-        }
-
-        public virtual int DragStepCount
-        {
-            get { return Convert.ToInt32(UsedValues["DragStepCount"]); }
-            set { SetUsedValue("DragStepCount", value); }
-        }
-
-        public virtual bool InProc
-        {
-            get { return Convert.ToBoolean(UsedValues["InProc"]); }
-            set { SetUsedValue("InProc", value); }
-        }
-
-        public virtual bool ComboBoxItemsPopulatedWithoutDropDownOpen
-        {
-            get { return Convert.ToBoolean(UsedValues["ComboBoxItemsPopulatedWithoutDropDownOpen"]); }
-            set { SetUsedValue("ComboBoxItemsPopulatedWithoutDropDownOpen", value); }
-        }
-
-        public virtual int ComboBoxItemSelectionTimeout
-        {
-            get { return Convert.ToInt32(UsedValues["ComboBoxItemSelectionTimeout"]); }
-            set { SetUsedValue("ComboBoxItemSelectionTimeout", value); }
-        }
-
-        public virtual int RawInputQueueProcessingTime
-        {
-            get { return Convert.ToInt32(UsedValues["RawInputQueueProcessingTime"]); }
-            set { SetUsedValue("RawInputQueueProcessingTime", value); }
-        }
-
-        public virtual bool RawElementBasedSearch
-        {
-            get { return Convert.ToBoolean(UsedValues["RawElementBasedSearch"]); }
-            set { SetUsedValue("RawElementBasedSearch", value); }
-        }
-
-        public virtual int MaxElementSearchDepth
-        {
-            get { return Convert.ToInt32(UsedValues["MaxElementSearchDepth"]); }
-            set { SetUsedValue("MaxElementSearchDepth", value); }
-        }
-
-        public virtual int DoubleClickInterval
-        {
-            get { return Convert.ToInt32(UsedValues["DoubleClickInterval"]); }
-            set { SetUsedValue("DoubleClickInterval", value); }
-        }
-
-        public virtual bool MoveMouseToGetStatusOfHourGlass
-        {
-            get { return Convert.ToBoolean(UsedValues["MoveMouseToGetStatusOfHourGlass"]); }
-            set { SetUsedValue("MoveMouseToGetStatusOfHourGlass", value); }
-        }
-
-        /// <summary>
-        /// Implements <see cref="ICoreConfiguration.KeepOpenOnDispose"/>
-        /// </summary>
-        public virtual bool KeepOpenOnDispose
-        {
-            get { return Convert.ToBoolean(UsedValues["KeepOpenOnDispose"]); }
-            set { SetUsedValue("KeepOpenOnDispose", value); }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/TestStack.White/Configuration/CoreConfiguration.cs b/src/TestStack.White/Configuration/CoreConfiguration.cs
new file mode 100644
index 00000000..f8f7d31c
--- /dev/null
+++ b/src/TestStack.White/Configuration/CoreConfiguration.cs
@@ -0,0 +1,209 @@
+using Castle.Core.Logging;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using TestStack.White.Bricks;
+using TestStack.White.Interceptors;
+using TestStack.White.UIItems;
+
+namespace TestStack.White.Configuration
+{
+    /// <summary>
+    /// Represents all the configuration at core level. These configuration can be set from the configuration file as well as programmatically.
+    /// </summary>
+    public class CoreConfiguration : ConfigurationBase<CoreConfiguration>
+    {
+        private const string BusyTimeoutKey = "BusyTimeout";
+        private const string FindWindowTimeoutKey = "FindWindowTimeout";
+        private const string WaitBasedOnHourGlassKey = "WaitBasedOnHourGlass";
+        private const string WorkSessionLocationKey = "WorkSessionLocation";
+        private const string UIAutomationZeroWindowBugTimeoutKey = "UIAutomationZeroWindowBugTimeout";
+        private const string PopupTimeoutKey = "PopupTimeout";
+        private const string TooltipWaitTimeKey = "TooltipWaitTime";
+        private const string SuggestionListTimeoutKey = "SuggestionListTimeout";
+        private const string HighlightTimeoutKey = "HighlightTimeout";
+        private const string DefaultDateFormatKey = "DefaultDateFormat";
+        private const string DragStepCountKey = "DragStepCount";
+        private const string InProcKey = "InProc";
+        private const string ComboBoxItemsPopulatedWithoutDropDownOpenKey = "ComboBoxItemsPopulatedWithoutDropDownOpen";
+        private const string ComboBoxItemSelectionTimeoutKey = "ComboBoxItemSelectionTimeout";
+        private const string RawInputQueueProcessingTimeKey = "RawInputQueueProcessingTime";
+        private const string RawElementBasedSearchKey = "RawElementBasedSearch";
+        private const string MaxElementSearchDepthKey = "MaxElementSearchDepth";
+        private const string DoubleClickIntervalKey = "DoubleClickInterval";
+        private const string MoveMouseToGetStatusOfHourGlassKey = "MoveMouseToGetStatusOfHourGlass";
+        private const string KeepOpenOnDisposeKey = "KeepOpenOnDispose";
+
+        private readonly DynamicProxyInterceptors interceptors = new DynamicProxyInterceptors();
+
+        public CoreConfiguration()
+        {
+            interceptors.Add(new FocusInterceptor());
+            interceptors.Add(new ScrollInterceptor());
+            LoggerFactory = new WhiteDefaultLoggerFactory(LoggerLevel.Info);
+        }
+
+        public virtual ILoggerFactory LoggerFactory { get; set; }
+
+        public virtual IWaitHook AdditionalWaitHook { get; set; }
+
+        public virtual DynamicProxyInterceptors Interceptors
+        {
+            get { return interceptors; }
+        }
+
+        public override Dictionary<string, object> DefaultValues
+        {
+            get
+            {
+                return new Dictionary<string, object>
+                {
+                    {BusyTimeoutKey, 5000},
+                    {FindWindowTimeoutKey, 30000},
+                    {WaitBasedOnHourGlassKey, true},
+                    {WorkSessionLocationKey, "."},
+                    {UIAutomationZeroWindowBugTimeoutKey, 5000},
+                    {PopupTimeoutKey, 5000},
+                    {TooltipWaitTimeKey, 3000},
+                    {SuggestionListTimeoutKey, 3000},
+                    {HighlightTimeoutKey, 1000},
+                    {DefaultDateFormatKey, DateFormat.CultureDefault.ToString()},
+                    {DragStepCountKey, 1},
+                    {InProcKey, false},
+                    {ComboBoxItemsPopulatedWithoutDropDownOpenKey, false},
+                    {ComboBoxItemSelectionTimeoutKey, 1000},
+                    {RawInputQueueProcessingTimeKey, 50},
+                    {RawElementBasedSearchKey, false},
+                    {MaxElementSearchDepthKey, 10},
+                    {DoubleClickIntervalKey, 0},
+                    {MoveMouseToGetStatusOfHourGlassKey, true},
+                    {KeepOpenOnDisposeKey, false}
+                };
+            }
+        }
+
+        public virtual int BusyTimeout
+        {
+            get { return GetValueInt32(BusyTimeoutKey); }
+            set { SetValue(BusyTimeoutKey, value); }
+        }
+
+        public virtual int FindWindowTimeout
+        {
+            get { return GetValueInt32(FindWindowTimeoutKey); }
+            set { SetValue(FindWindowTimeoutKey, value); }
+        }
+
+        public virtual bool WaitBasedOnHourGlass
+        {
+            get { return GetValueBoolean(WaitBasedOnHourGlassKey); }
+            set { SetValue(WaitBasedOnHourGlassKey, value); }
+        }
+
+        public virtual DirectoryInfo WorkSessionLocation
+        {
+            get { return new DirectoryInfo(GetValue(WorkSessionLocationKey)); }
+            set { SetValue(WorkSessionLocationKey, value); }
+        }
+
+        public virtual int UIAutomationZeroWindowBugTimeout
+        {
+            get { return GetValueInt32(UIAutomationZeroWindowBugTimeoutKey); }
+            set { SetValue(UIAutomationZeroWindowBugTimeoutKey, value); }
+        }
+
+        public virtual int PopupTimeout
+        {
+            get { return GetValueInt32(PopupTimeoutKey); }
+            set { SetValue(PopupTimeoutKey, value); }
+        }
+
+        public virtual int TooltipWaitTime
+        {
+            get { return GetValueInt32(TooltipWaitTimeKey); }
+            set { SetValue(TooltipWaitTimeKey, value); }
+        }
+
+        public virtual int SuggestionListTimeout
+        {
+            get { return GetValueInt32(SuggestionListTimeoutKey); }
+            set { SetValue(SuggestionListTimeoutKey, value); }
+        }
+
+        public virtual int HighlightTimeout
+        {
+            get { return GetValueInt32(HighlightTimeoutKey); }
+            set { SetValue(HighlightTimeoutKey, value); }
+        }
+
+        public virtual DateFormat DefaultDateFormat
+        {
+            get { return DateFormat.Parse(GetValue(DefaultDateFormatKey)); }
+            set { SetValue(DefaultDateFormatKey, value); }
+        }
+
+        public virtual int DragStepCount
+        {
+            get { return GetValueInt32(DragStepCountKey); }
+            set { SetValue(DragStepCountKey, value); }
+        }
+
+        public virtual bool InProc
+        {
+            get { return GetValueBoolean(InProcKey); }
+            set { SetValue(InProcKey, value); }
+        }
+
+        public virtual bool ComboBoxItemsPopulatedWithoutDropDownOpen
+        {
+            get { return GetValueBoolean(ComboBoxItemsPopulatedWithoutDropDownOpenKey); }
+            set { SetValue(ComboBoxItemsPopulatedWithoutDropDownOpenKey, value); }
+        }
+
+        public virtual int ComboBoxItemSelectionTimeout
+        {
+            get { return GetValueInt32(ComboBoxItemSelectionTimeoutKey); }
+            set { SetValue(ComboBoxItemSelectionTimeoutKey, value); }
+        }
+
+        public virtual int RawInputQueueProcessingTime
+        {
+            get { return GetValueInt32(RawInputQueueProcessingTimeKey); }
+            set { SetValue(RawInputQueueProcessingTimeKey, value); }
+        }
+
+        public virtual bool RawElementBasedSearch
+        {
+            get { return GetValueBoolean(RawElementBasedSearchKey); }
+            set { SetValue(RawElementBasedSearchKey, value); }
+        }
+
+        public virtual int MaxElementSearchDepth
+        {
+            get { return GetValueInt32(MaxElementSearchDepthKey); }
+            set { SetValue(MaxElementSearchDepthKey, value); }
+        }
+
+        public virtual int DoubleClickInterval
+        {
+            get { return GetValueInt32(DoubleClickIntervalKey); }
+            set { SetValue(DoubleClickIntervalKey, value); }
+        }
+
+        public virtual bool MoveMouseToGetStatusOfHourGlass
+        {
+            get { return GetValueBoolean(MoveMouseToGetStatusOfHourGlassKey); }
+            set { SetValue(MoveMouseToGetStatusOfHourGlassKey, value); }
+        }
+
+        /// <summary>
+        /// Flag to allow keeping the <see cref="TestStack.White.Application"/> and <see cref="TestStack.White.UIItems.WindowItems.Window" />
+        /// open after White has disposed it's objects.
+        /// </summary>
+        public virtual bool KeepOpenOnDispose
+        {
+            get { return GetValueBoolean(KeepOpenOnDisposeKey); }
+            set { SetValue(KeepOpenOnDisposeKey, value); }
+        }
+    }
+}
diff --git a/src/TestStack.White/Configuration/CoreConfigurationLocator.cs b/src/TestStack.White/Configuration/CoreConfigurationLocator.cs
new file mode 100644
index 00000000..93dfb6fd
--- /dev/null
+++ b/src/TestStack.White/Configuration/CoreConfigurationLocator.cs
@@ -0,0 +1,24 @@
+using TestStack.White.Configuration.Readers;
+
+namespace TestStack.White.Configuration
+{
+    public static class CoreConfigurationLocator
+    {
+        private static CoreConfiguration coreConfiguration;
+
+        public static CoreConfiguration Get()
+        {
+            if (coreConfiguration == null)
+            {
+                Set(new AppConfigReader("White", "Core"));
+            }
+            return coreConfiguration;
+        }
+
+        public static void Set(IConfigurationReader configurationReader)
+        {
+            coreConfiguration = new CoreConfiguration();
+            configurationReader.FillConfigurationFromReader(coreConfiguration);
+        }
+    }
+}
diff --git a/src/TestStack.White/Configuration/IConfiguration.cs b/src/TestStack.White/Configuration/IConfiguration.cs
new file mode 100644
index 00000000..5a654803
--- /dev/null
+++ b/src/TestStack.White/Configuration/IConfiguration.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+
+namespace TestStack.White.Configuration
+{
+    public interface IConfiguration
+    {
+        void SetValue(string key, object value);
+        string GetValue(string key);
+        Dictionary<string, object> DefaultValues { get; }
+    }
+}
diff --git a/src/TestStack.White/Configuration/ICoreConfiguration.cs b/src/TestStack.White/Configuration/ICoreConfiguration.cs
deleted file mode 100644
index 0850f679..00000000
--- a/src/TestStack.White/Configuration/ICoreConfiguration.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.IO;
-using Castle.Core.Logging;
-using TestStack.White.Bricks;
-using TestStack.White.UIItems;
-
-namespace TestStack.White.Configuration
-{
-    /// <summary>
-    /// Represents all the configuration at Core level. These configuration can be set from the configuration file as well as programmatically.
-    /// </summary>
-    public interface ICoreConfiguration
-    {
-        ILoggerFactory LoggerFactory { get; set; }
-        IDisposable ApplyTemporarySetting(Action<ICoreConfiguration> changes);
-        IWaitHook AdditionalWaitHook { get; set; }
-        DynamicProxyInterceptors Interceptors { get; }
-
-        /// <summary>
-        /// In Milliseconds
-        /// </summary>
-        int BusyTimeout { get; set; }
-        int FindWindowTimeout { get; set; }
-        bool WaitBasedOnHourGlass { get; set; }
-        DirectoryInfo WorkSessionLocation { get; set; }
-        int UIAutomationZeroWindowBugTimeout { get; set; }
-        int PopupTimeout { get; set; }
-        int TooltipWaitTime { get; set; }
-        int SuggestionListTimeout { get; set; }
-        int HighlightTimeout { get; set; }
-        DateFormat DefaultDateFormat { get; set; }
-        int DragStepCount { get; set; }
-        bool InProc { get; set; }
-        bool ComboBoxItemsPopulatedWithoutDropDownOpen { get; set; }
-        int ComboBoxItemSelectionTimeout { get; set; }
-        int RawInputQueueProcessingTime { get; set; }
-        bool RawElementBasedSearch { get; set; }
-        int MaxElementSearchDepth { get; set; }
-        int DoubleClickInterval { get; set; }
-        bool MoveMouseToGetStatusOfHourGlass { get; set; }
-        /// <summary>
-        /// Flag to allow keeping the <see cref="TestStack.White.Application"/> and <see cref="TestStack.White.UIItems.WindowItems.Window" />
-        /// open after White has disposed it's objects.
-        /// </summary>
-        bool KeepOpenOnDispose { get;set;}
-    }
-}
\ No newline at end of file
diff --git a/src/TestStack.White/Configuration/IUIItemIdConfiguration.cs b/src/TestStack.White/Configuration/IUIItemIdConfiguration.cs
deleted file mode 100644
index 528decdb..00000000
--- a/src/TestStack.White/Configuration/IUIItemIdConfiguration.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-namespace TestStack.White.Configuration
-{
-    public interface IUIItemIdConfiguration
-    {
-        string TableVerticalScrollBar { get; set; }
-        string TableHorizontalScrollBar { get; set; }
-        string TableColumn { get; set; }
-        string TableTopLeftHeaderCell { get; set; }
-        string TableCellNullValue { get; set; }
-        string TableHeader { get; set; }
-        string HorizontalScrollBar { get; set; }
-        string VerticalScrollBar { get; set; }
-        string TableCellPrefix { get; set; }
-        /// <summary>
-        /// The text for the "browse"-button
-        /// </summary>
-        string BrowseText { get; set; }
-        /// <summary>
-        /// The dialog title of the open browse dialog
-        /// </summary>
-        string OpenFileDialogTitle { get; set; }
-        /// <summary>
-        /// Text of the misc category on a property grid
-        /// </summary>
-        string PropertyGridMiscText { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/TestStack.White/Configuration/Readers/AppConfigReader.cs b/src/TestStack.White/Configuration/Readers/AppConfigReader.cs
new file mode 100644
index 00000000..28f6d693
--- /dev/null
+++ b/src/TestStack.White/Configuration/Readers/AppConfigReader.cs
@@ -0,0 +1,47 @@
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Configuration;
+
+namespace TestStack.White.Configuration.Readers
+{
+    /// <summary>
+    /// Configuration reader which reads from the app.config file
+    /// </summary>
+    public class AppConfigReader : IConfigurationReader
+    {
+        private NameValueCollection nameValues;
+
+        public AppConfigReader(string sectionGroup, string sectionName)
+        {
+            nameValues = (NameValueCollection)ConfigurationManager.GetSection(sectionGroup + "/" + sectionName);
+            if (nameValues == null)
+            {
+                nameValues = new NameValueCollection();
+            }
+        }
+
+        public void FillConfigurationFromReader(IConfiguration configuration)
+        {
+            // Overwrite the values contained in the section
+            foreach (var key in nameValues.AllKeys)
+            {
+                var value = nameValues.Get(key);
+                if (value != null)
+                {
+                    configuration.SetValue(key, value);
+                }
+            }
+            // Overwrite the values from the AppSettings (if available)
+            var allKeys = new List<string>(nameValues.AllKeys);
+            allKeys.AddRange(configuration.DefaultValues.Keys);
+            foreach (var key in allKeys)
+            {
+                var value = ConfigurationManager.AppSettings[key];
+                if (value != null)
+                {
+                    configuration.SetValue(key, value);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/TestStack.White/Configuration/Readers/IConfigurationReader.cs b/src/TestStack.White/Configuration/Readers/IConfigurationReader.cs
new file mode 100644
index 00000000..f21dc5c6
--- /dev/null
+++ b/src/TestStack.White/Configuration/Readers/IConfigurationReader.cs
@@ -0,0 +1,11 @@
+
+namespace TestStack.White.Configuration.Readers
+{
+    public interface IConfigurationReader
+    {
+        /// <summary>
+        /// Method to override to fill the configuration
+        /// </summary>
+        void FillConfigurationFromReader(IConfiguration configuration);
+    }
+}
diff --git a/src/TestStack.White/Configuration/UIItemIdAppXmlConfiguration.cs b/src/TestStack.White/Configuration/UIItemIdAppXmlConfiguration.cs
deleted file mode 100644
index 6392c006..00000000
--- a/src/TestStack.White/Configuration/UIItemIdAppXmlConfiguration.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-using System.Collections.Generic;
-using TestStack.White.Bricks;
-using TestStack.White.Utility;
-
-namespace TestStack.White.Configuration
-{
-    public class UIItemIdAppXmlConfiguration : AssemblyConfiguration, IUIItemIdConfiguration
-    {
-        private static IUIItemIdConfiguration instance;
-        private static readonly Dictionary<string, object> DefaultValues = new Dictionary<string, object>();
-
-        static UIItemIdAppXmlConfiguration()
-        {
-            switch (SystemLanguageRetreiver.GetCurrentOsCulture().TwoLetterISOLanguageName)
-            {
-                case "de":
-                    DefaultValues.Add("TableVerticalScrollBar", "Vertikale Schiebeleiste");
-                    DefaultValues.Add("TableHorizontalScrollBar", "Horizontale Schiebeleiste");
-                    DefaultValues.Add("TableColumn", "Zeile ");
-                    DefaultValues.Add("TableTopLeftHeaderCell", "Obere linke Headerzelle");
-                    DefaultValues.Add("TableCellNullValue", "(null)");
-                    DefaultValues.Add("TableHeader", "Oberste Zeile");
-                    DefaultValues.Add("HorizontalScrollBar", "Horizontale Schiebeleiste");
-                    DefaultValues.Add("VerticalScrollBar", "Vertikale Schiebeleiste");
-                    DefaultValues.Add("TableCellPrefix", " Zeile ");
-                    DefaultValues.Add("BrowseText", "Durchsuchen...");
-                    DefaultValues.Add("OpenFileDialogTitle", "Datei öffnen");
-                    DefaultValues.Add("PropertyGridMiscText", "Sonstiges");
-                    break;
-                default:
-                    DefaultValues.Add("TableVerticalScrollBar", "Vertical Scroll Bar");
-                    DefaultValues.Add("TableHorizontalScrollBar", "Horizontal Scroll Bar");
-                    DefaultValues.Add("TableColumn", "Row ");
-                    DefaultValues.Add("TableTopLeftHeaderCell", "Top Left Header Cell");
-                    DefaultValues.Add("TableCellNullValue", "(null)");
-                    DefaultValues.Add("TableHeader", "Top Row");
-                    DefaultValues.Add("HorizontalScrollBar", "Horizontal ScrollBar");
-                    DefaultValues.Add("VerticalScrollBar", "Vertical ScrollBar");
-                    DefaultValues.Add("TableCellPrefix", " Row ");
-                    DefaultValues.Add("BrowseText", "Browse...");
-                    DefaultValues.Add("OpenFileDialogTitle", "Open File");
-                    DefaultValues.Add("PropertyGridMiscText", "Misc");
-                    break;
-            }
-        }
-
-        public static IUIItemIdConfiguration Instance
-        {
-            get { return instance ?? (instance = new UIItemIdAppXmlConfiguration()); }
-        }
-
-        private UIItemIdAppXmlConfiguration() :
-            base("White", "UIItemId", DefaultValues, CoreAppXmlConfiguration.Instance.LoggerFactory.Create(typeof(UIItemIdAppXmlConfiguration)))
-        { }
-
-        private void SetUsedValue(string key, object value)
-        {
-            UsedValues[key] = value.ToString();
-        }
-
-        public virtual string TableVerticalScrollBar
-        {
-            get { return UsedValues["TableVerticalScrollBar"]; }
-            set { SetUsedValue("TableVerticalScrollBar", value); }
-        }
-
-        public virtual string TableHorizontalScrollBar
-        {
-            get { return UsedValues["TableHorizontalScrollBar"]; }
-            set { SetUsedValue("TableHorizontalScrollBar", value); }
-        }
-
-        public virtual string TableColumn
-        {
-            get { return UsedValues["TableColumn"]; }
-            set { SetUsedValue("TableColumn", value); }
-        }
-
-        public virtual string TableTopLeftHeaderCell
-        {
-            get { return UsedValues["TableTopLeftHeaderCell"]; }
-            set { SetUsedValue("TableTopLeftHeaderCell", value); }
-        }
-
-        public virtual string TableCellNullValue
-        {
-            get { return UsedValues["TableCellNullValue"]; }
-            set { SetUsedValue("TableCellNullValue", value); }
-        }
-
-        public virtual string TableHeader
-        {
-            get { return UsedValues["TableHeader"]; }
-            set { SetUsedValue("TableHeader", value); }
-        }
-
-        public virtual string HorizontalScrollBar
-        {
-            get { return UsedValues["HorizontalScrollBar"]; }
-            set { SetUsedValue("HorizontalScrollBar", value); }
-        }
-
-        public virtual string VerticalScrollBar
-        {
-            get { return UsedValues["VerticalScrollBar"]; }
-            set { SetUsedValue("VerticalScrollBar", value); }
-        }
-
-        public virtual string TableCellPrefix
-        {
-            get { return UsedValues["TableCellPrefix"]; }
-            set { SetUsedValue("TableCellPrefix", value); }
-        }
-
-        public virtual string BrowseText
-        {
-            get { return UsedValues["BrowseText"]; }
-            set { SetUsedValue("BrowseText", value); }
-        }
-
-        public virtual string OpenFileDialogTitle
-        {
-            get { return UsedValues["OpenFileDialogTitle"]; }
-            set { SetUsedValue("OpenFileDialogTitle", value); }
-        }
-
-        public virtual string PropertyGridMiscText
-        {
-            get { return UsedValues["PropertyGridMiscText"]; }
-            set { SetUsedValue("PropertyGridMiscText", value); }
-        }        
-    }
-}
\ No newline at end of file
diff --git a/src/TestStack.White/Configuration/UIItemIdConfiguration.cs b/src/TestStack.White/Configuration/UIItemIdConfiguration.cs
new file mode 100644
index 00000000..c1195a2d
--- /dev/null
+++ b/src/TestStack.White/Configuration/UIItemIdConfiguration.cs
@@ -0,0 +1,144 @@
+using System.Collections.Generic;
+using TestStack.White.Utility;
+
+namespace TestStack.White.Configuration
+{
+    public class UIItemIdConfiguration : ConfigurationBase<UIItemIdConfiguration>
+    {
+        private const string TableVerticalScrollBarKey = "TableVerticalScrollBar";
+        private const string TableHorizontalScrollBarKey = "TableHorizontalScrollBar";
+        private const string TableColumnKey = "TableColumn";
+        private const string TableTopLeftHeaderCellKey = "TableTopLeftHeaderCell";
+        private const string TableCellNullValueKey = "TableCellNullValue";
+        private const string TableHeaderKey = "TableHeader";
+        private const string HorizontalScrollBarKey = "HorizontalScrollBar";
+        private const string VerticalScrollBarKey = "VerticalScrollBar";
+        private const string TableCellPrefixKey = "TableCellPrefix";
+        private const string BrowseTextKey = "BrowseText";
+        private const string OpenFileDialogTitleKey = "OpenFileDialogTitle";
+        private const string PropertyGridMiscTextKey = "PropertyGridMiscText";
+
+        public override Dictionary<string, object> DefaultValues
+        {
+            get
+            {
+                switch (SystemLanguageRetreiver.GetCurrentOsCulture().TwoLetterISOLanguageName)
+                {
+                    case "de":
+                        return new Dictionary<string, object>
+                        {
+                            {TableVerticalScrollBarKey, "Vertikale Schiebeleiste"},
+                            {TableHorizontalScrollBarKey, "Horizontale Schiebeleiste"},
+                            {TableColumnKey, "Zeile "},
+                            {TableTopLeftHeaderCellKey, "Obere linke Headerzelle"},
+                            {TableCellNullValueKey, "(null)"},
+                            {TableHeaderKey, "Oberste Zeile"},
+                            {HorizontalScrollBarKey, "Horizontale Schiebeleiste"},
+                            {VerticalScrollBarKey, "Vertikale Schiebeleiste"},
+                            {TableCellPrefixKey, " Zeile "},
+                            {BrowseTextKey, "Durchsuchen..."},
+                            {OpenFileDialogTitleKey, "Datei öffnen"},
+                            {PropertyGridMiscTextKey, "Sonstiges"}
+                        };
+                    default:
+                        return new Dictionary<string, object>
+                        {
+                            {TableVerticalScrollBarKey, "Vertical Scroll Bar"},
+                            {TableHorizontalScrollBarKey, "Horizontal Scroll Bar"},
+                            {TableColumnKey, "Row "},
+                            {TableTopLeftHeaderCellKey, "Top Left Header Cell"},
+                            {TableCellNullValueKey, "(null)"},
+                            {TableHeaderKey, "Top Row"},
+                            {HorizontalScrollBarKey, "Horizontal ScrollBar"},
+                            {VerticalScrollBarKey, "Vertical ScrollBar"},
+                            {TableCellPrefixKey, " Row "},
+                            {BrowseTextKey, "Browse..."},
+                            {OpenFileDialogTitleKey, "Open File"},
+                            {PropertyGridMiscTextKey, "Misc"}
+                        };
+                }
+            }
+        }
+
+        public virtual string TableVerticalScrollBar
+        {
+            get { return GetValue(TableVerticalScrollBarKey); }
+            set { SetValue(TableVerticalScrollBarKey, value); }
+        }
+
+        public virtual string TableHorizontalScrollBar
+        {
+            get { return GetValue(TableHorizontalScrollBarKey); }
+            set { SetValue(TableHorizontalScrollBarKey, value); }
+        }
+
+        public virtual string TableColumn
+        {
+            get { return GetValue(TableColumnKey); }
+            set { SetValue(TableColumnKey, value); }
+        }
+
+        public virtual string TableTopLeftHeaderCell
+        {
+            get { return GetValue(TableTopLeftHeaderCellKey); }
+            set { SetValue(TableTopLeftHeaderCellKey, value); }
+        }
+
+        public virtual string TableCellNullValue
+        {
+            get { return GetValue(TableCellNullValueKey); }
+            set { SetValue(TableCellNullValueKey, value); }
+        }
+
+        public virtual string TableHeader
+        {
+            get { return GetValue(TableHeaderKey); }
+            set { SetValue(TableHeaderKey, value); }
+        }
+
+        public virtual string HorizontalScrollBar
+        {
+            get { return GetValue(HorizontalScrollBarKey); }
+            set { SetValue(HorizontalScrollBarKey, value); }
+        }
+
+        public virtual string VerticalScrollBar
+        {
+            get { return GetValue(VerticalScrollBarKey); }
+            set { SetValue(VerticalScrollBarKey, value); }
+        }
+
+        public virtual string TableCellPrefix
+        {
+            get { return GetValue(TableCellPrefixKey); }
+            set { SetValue(TableCellPrefixKey, value); }
+        }
+
+        /// <summary>
+        /// The text for the "browse"-button
+        /// </summary>
+        public virtual string BrowseText
+        {
+            get { return GetValue(BrowseTextKey); }
+            set { SetValue(BrowseTextKey, value); }
+        }
+
+        /// <summary>
+        /// The dialog title of the open browse dialog
+        /// </summary>
+        public virtual string OpenFileDialogTitle
+        {
+            get { return GetValue(OpenFileDialogTitleKey); }
+            set { SetValue(OpenFileDialogTitleKey, value); }
+        }
+
+        /// <summary>
+        /// Text of the misc category on a property grid
+        /// </summary>
+        public virtual string PropertyGridMiscText
+        {
+            get { return GetValue(PropertyGridMiscTextKey); }
+            set { SetValue(PropertyGridMiscTextKey, value); }
+        }
+    }
+}
diff --git a/src/TestStack.White/Configuration/UIItemIdConfigurationLocator.cs b/src/TestStack.White/Configuration/UIItemIdConfigurationLocator.cs
new file mode 100644
index 00000000..54bc3cea
--- /dev/null
+++ b/src/TestStack.White/Configuration/UIItemIdConfigurationLocator.cs
@@ -0,0 +1,24 @@
+using TestStack.White.Configuration.Readers;
+
+namespace TestStack.White.Configuration
+{
+    public static class UIItemIdConfigurationLocator
+    {
+        private static UIItemIdConfiguration uiItemIdConfiguration;
+
+        public static UIItemIdConfiguration Get()
+        {
+            if (uiItemIdConfiguration == null)
+            {
+                Set(new AppConfigReader("White", "UIItemId"));
+            }
+            return uiItemIdConfiguration;
+        }
+
+        public static void Set(IConfigurationReader configurationReader)
+        {
+            uiItemIdConfiguration = new UIItemIdConfiguration();
+            configurationReader.FillConfigurationFromReader(uiItemIdConfiguration);
+        }
+    }
+}
diff --git a/src/TestStack.White/Constants.cs b/src/TestStack.White/Constants.cs
index 438b9f2c..0f4aca14 100644
--- a/src/TestStack.White/Constants.cs
+++ b/src/TestStack.White/Constants.cs
@@ -6,7 +6,7 @@ public static class Constants
     {
         public static string BusyMessage
         {
-            get { return string.Format(", after waiting for {0} ms", CoreAppXmlConfiguration.Instance.BusyTimeout); }
+            get { return string.Format(", after waiting for {0} ms", CoreConfigurationLocator.Get().BusyTimeout); }
         }
     }
 }
\ No newline at end of file
diff --git a/src/TestStack.White/Debug.cs b/src/TestStack.White/Debug.cs
index 9720c45d..8d101adf 100644
--- a/src/TestStack.White/Debug.cs
+++ b/src/TestStack.White/Debug.cs
@@ -10,7 +10,7 @@ namespace TestStack.White
 {
     public static class Debug
     {
-        private static readonly ILogger Logger = CoreAppXmlConfiguration.Instance.LoggerFactory.Create(typeof(Debug));
+        private static readonly ILogger Logger = CoreConfigurationLocator.Get().LoggerFactory.Create(typeof(Debug));
         private const string Tab = "  ";
 
         public static void ProcessDetails(string processName)
diff --git a/src/TestStack.White/Drawing/ScreenRectangle.cs b/src/TestStack.White/Drawing/ScreenRectangle.cs
index 61203b8b..213c9b73 100644
--- a/src/TestStack.White/Drawing/ScreenRectangle.cs
+++ b/src/TestStack.White/Drawing/ScreenRectangle.cs
@@ -64,7 +64,7 @@ internal FrameRectangle(Color color, Rect boundingRectangle)
         internal virtual void Highlight()
         {
             rectangles.ToList().ForEach(x => x.Show());
-            Thread.Sleep(CoreAppXmlConfiguration.Instance.HighlightTimeout);
+            Thread.Sleep(CoreConfigurationLocator.Get().HighlightTimeout);
             rectangles.ToList().ForEach(x => x.Hide());
         }
     }
diff --git a/src/TestStack.White/Factory/ChildWindowFactory.cs b/src/TestStack.White/Factory/ChildWindowFactory.cs
index 7b685ae6..415f3c34 100644
--- a/src/TestStack.White/Factory/ChildWindowFactory.cs
+++ b/src/TestStack.White/Factory/ChildWindowFactory.cs
@@ -4,6 +4,7 @@
 using TestStack.White.AutomationElementSearch;
 using TestStack.White.Configuration;
 using TestStack.White.Sessions;
+using TestStack.White.SystemExtensions;
 using TestStack.White.UIItems;
 using TestStack.White.UIItems.Finders;
 using TestStack.White.UIItems.WindowItems;
@@ -39,7 +40,7 @@ public virtual Window ModalWindow(SearchCriteria searchCriteria, InitializeOptio
 
         protected virtual AutomationElement WaitTillFound(Func<AutomationElement> find, string message)
         {
-            var element = Retry.For(find, CoreAppXmlConfiguration.Instance.FindWindowTimeout());
+            var element = Retry.For(find, CoreConfigurationLocator.Get().FindWindowTimeout.AsTimeSpan());
             if (element == null)
                 throw new AutomationException(message, Debug.GetAllWindows());
             return element;
diff --git a/src/TestStack.White/Factory/PrimaryUIItemFactory.cs b/src/TestStack.White/Factory/PrimaryUIItemFactory.cs
index 5edc3cf8..dc197cf2 100644
--- a/src/TestStack.White/Factory/PrimaryUIItemFactory.cs
+++ b/src/TestStack.White/Factory/PrimaryUIItemFactory.cs
@@ -4,6 +4,7 @@
 using System.Windows.Automation;
 using TestStack.White.AutomationElementSearch;
 using TestStack.White.Configuration;
+using TestStack.White.SystemExtensions;
 using TestStack.White.UIItems;
 using TestStack.White.UIItems.Actions;
 using TestStack.White.UIItems.Finders;
@@ -54,7 +55,7 @@ public virtual bool TryGetPopupMenu(IActionListener actionListener, out PopUpMen
 
         private bool TryGetPopupMenu(AutomationSearchCondition[] searchConditions, IActionListener actionListener, out PopUpMenu popUpMenu)
         {
-            var element = Retry.For(() => Finder.Child(searchConditions), CoreAppXmlConfiguration.Instance.PopupTimeout(), TimeSpan.FromMilliseconds(100));
+            var element = Retry.For(() => Finder.Child(searchConditions), CoreConfigurationLocator.Get().PopupTimeout.AsTimeSpan(), TimeSpan.FromMilliseconds(100));
             if (element == null)
             {
                 popUpMenu = null;
diff --git a/src/TestStack.White/Factory/ToolTipFinder.cs b/src/TestStack.White/Factory/ToolTipFinder.cs
index c7b4c89d..4c2adeab 100644
--- a/src/TestStack.White/Factory/ToolTipFinder.cs
+++ b/src/TestStack.White/Factory/ToolTipFinder.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Windows.Automation;
 using TestStack.White.Configuration;
+using TestStack.White.SystemExtensions;
 using TestStack.White.UIItems;
 using TestStack.White.UIItems.Actions;
 using TestStack.White.Utility;
@@ -11,7 +12,7 @@ public static class ToolTipFinder
     {
         public static ToolTip FindToolTip(Func<AutomationElement> perform, AutomationElement parentAutomationElement)
         {
-            var automationElement = Retry.For(perform, CoreAppXmlConfiguration.Instance.TooltipWaitTimeSpan());
+            var automationElement = Retry.For(perform, CoreConfigurationLocator.Get().TooltipWaitTime.AsTimeSpan());
             if (automationElement == null)
                 throw new AutomationException("Unable to find tooltip", Debug.Details(parentAutomationElement));
 
diff --git a/src/TestStack.White/Factory/WindowFactory.cs b/src/TestStack.White/Factory/WindowFactory.cs
index a5826fbd..2687a377 100644
--- a/src/TestStack.White/Factory/WindowFactory.cs
+++ b/src/TestStack.White/Factory/WindowFactory.cs
@@ -1,12 +1,13 @@
+using Castle.Core.Logging;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Windows.Automation;
-using Castle.Core.Logging;
 using TestStack.White.AutomationElementSearch;
 using TestStack.White.Configuration;
 using TestStack.White.Sessions;
+using TestStack.White.SystemExtensions;
 using TestStack.White.UIItems;
 using TestStack.White.UIItems.Actions;
 using TestStack.White.UIItems.Finders;
@@ -18,7 +19,7 @@ namespace TestStack.White.Factory
 {
     public class WindowFactory : ChildWindowFactory
     {
-        private readonly ILogger logger = CoreAppXmlConfiguration.Instance.LoggerFactory.Create(typeof(WindowFactory));
+        private readonly ILogger logger = CoreConfigurationLocator.Get().LoggerFactory.Create(typeof(WindowFactory));
         private WindowFactory(AutomationElementFinder automationElementFinder) : base(automationElementFinder) {}
 
         public static WindowFactory Desktop
@@ -47,7 +48,7 @@ private List<AutomationElement> FindAllWindowElements(Process process)
                 FindDescendantWindowElements(Finder, process, windowElements);
                 if (windowElements.Count == 0) logger.Warn("Could not find any windows for this application.");
                 return windowElements;
-            }, list => list.Count == 0, CoreAppXmlConfiguration.Instance.UIAutomationZeroWindowBugTimeout());
+            }, list => list.Count == 0, CoreConfigurationLocator.Get().UIAutomationZeroWindowBugTimeout.AsTimeSpan());
 
             return items ?? new List<AutomationElement>();
         }
diff --git a/src/TestStack.White/InputDevices/Keyboard.cs b/src/TestStack.White/InputDevices/Keyboard.cs
index 88221744..cfeeb05a 100644
--- a/src/TestStack.White/InputDevices/Keyboard.cs
+++ b/src/TestStack.White/InputDevices/Keyboard.cs
@@ -71,7 +71,7 @@ public virtual void Send(string keysToType, IActionListener actionListener)
             // Let the Raw Input Thread some time to process OS's hardware input queue.
             // As this thread works with High priority - this short wait should be enough hopefully.
             // For details see this post: http://blogs.msdn.com/b/oldnewthing/archive/2014/02/13/10499047.aspx
-            Thread.Sleep(CoreAppXmlConfiguration.Instance.RawInputQueueProcessingTime);
+            Thread.Sleep(CoreConfigurationLocator.Get().RawInputQueueProcessingTime);
 
             actionListener.ActionPerformed(Action.WindowMessage);
         }
@@ -88,7 +88,7 @@ public virtual void PressSpecialKey(KeyboardInput.SpecialKeys key, IActionListen
             // Let the Raw Input Thread some time to process OS's hardware input queue.
             // As this thread works with High priority - this short wait should be enough hopefully.
             // For details see this post: http://blogs.msdn.com/b/oldnewthing/archive/2014/02/13/10499047.aspx
-            Thread.Sleep(CoreAppXmlConfiguration.Instance.RawInputQueueProcessingTime);
+            Thread.Sleep(CoreConfigurationLocator.Get().RawInputQueueProcessingTime);
             
             actionListener.ActionPerformed(Action.WindowMessage);
         }
diff --git a/src/TestStack.White/InputDevices/Mouse.cs b/src/TestStack.White/InputDevices/Mouse.cs
index edbb0481..808c26c3 100644
--- a/src/TestStack.White/InputDevices/Mouse.cs
+++ b/src/TestStack.White/InputDevices/Mouse.cs
@@ -153,7 +153,7 @@ public virtual void Click(MouseButton mouseButton, Point point, IActionListener
         public virtual void DoubleClick(MouseButton mouseButton)
         {
             MouseButtonUpAndDown(mouseButton);
-            Thread.Sleep(CoreAppXmlConfiguration.Instance.DoubleClickInterval);
+            Thread.Sleep(CoreConfigurationLocator.Get().DoubleClickInterval);
             MouseButtonUpAndDown(mouseButton);
         }
 
@@ -186,7 +186,7 @@ private static void MouseButtonUpAndDown(MouseButton mouseButton)
             // Let the Raw Input Thread some time to process OS's hardware input queue.
             // As this thread works with High priority - this short wait should be enough hopefully.
             // For details see this post: http://blogs.msdn.com/b/oldnewthing/archive/2014/02/13/10499047.aspx
-            Thread.Sleep(CoreAppXmlConfiguration.Instance.RawInputQueueProcessingTime);
+            Thread.Sleep(CoreConfigurationLocator.Get().RawInputQueueProcessingTime);
         }
 
         /// <summary>
@@ -355,8 +355,8 @@ public virtual void DragAndDrop(MouseButton mouseButton, IUIItem draggedItem, Po
         {
             Location = startPosition;
             MouseButtonDown(mouseButton);
-            var dragStepFraction = (float)(1.0 / CoreAppXmlConfiguration.Instance.DragStepCount);
-            for (int i = 1; i <= CoreAppXmlConfiguration.Instance.DragStepCount; i++)
+            var dragStepFraction = (float)(1.0 / CoreConfigurationLocator.Get().DragStepCount);
+            for (int i = 1; i <= CoreConfigurationLocator.Get().DragStepCount; i++)
             {
                 var newX = startPosition.X + (endPosition.X - startPosition.X) * (dragStepFraction * i);
                 var newY = startPosition.Y + (endPosition.Y - startPosition.Y) * (dragStepFraction * i);
diff --git a/src/TestStack.White/Interceptors/CoreInterceptor.cs b/src/TestStack.White/Interceptors/CoreInterceptor.cs
index 91163edb..081f71cb 100644
--- a/src/TestStack.White/Interceptors/CoreInterceptor.cs
+++ b/src/TestStack.White/Interceptors/CoreInterceptor.cs
@@ -11,7 +11,7 @@ namespace TestStack.White.Interceptors
     public class CoreInterceptor : IInterceptor
     {
         private readonly CoreInterceptContext coreInterceptContext;
-        private readonly ILogger logger = CoreAppXmlConfiguration.Instance.LoggerFactory.Create(typeof(CoreInterceptor));
+        private readonly ILogger logger = CoreConfigurationLocator.Get().LoggerFactory.Create(typeof(CoreInterceptor));
 
         public CoreInterceptor(IUIItem uiItem, IActionListener actionListener)
         {
@@ -23,7 +23,7 @@ public virtual void Intercept(IInvocation invocation)
             coreInterceptContext.VerifyUIItem();
             try
             {
-                CoreAppXmlConfiguration.Instance.Interceptors.Process(invocation, coreInterceptContext);
+                CoreConfigurationLocator.Get().Interceptors.Process(invocation, coreInterceptContext);
             }
             catch (Exception)
             {
diff --git a/src/TestStack.White/Recording/SafeAutomationEventHandler.cs b/src/TestStack.White/Recording/SafeAutomationEventHandler.cs
index 1c1e4517..02bce3b9 100644
--- a/src/TestStack.White/Recording/SafeAutomationEventHandler.cs
+++ b/src/TestStack.White/Recording/SafeAutomationEventHandler.cs
@@ -12,7 +12,7 @@ public class SafeAutomationEventHandler
         private readonly IUIItem uiItem;
         private readonly Create createUserEvent;
         private readonly IUIItemEventListener eventListener;
-        private readonly ILogger logger = CoreAppXmlConfiguration.Instance.LoggerFactory.Create(typeof(SafeAutomationEventHandler));
+        private readonly ILogger logger = CoreConfigurationLocator.Get().LoggerFactory.Create(typeof(SafeAutomationEventHandler));
 
         public delegate UserEvent Create(object[] parameters);
 
diff --git a/src/TestStack.White/ScreenMap/WindowItemsMap.cs b/src/TestStack.White/ScreenMap/WindowItemsMap.cs
index d975071e..64dacff8 100644
--- a/src/TestStack.White/ScreenMap/WindowItemsMap.cs
+++ b/src/TestStack.White/ScreenMap/WindowItemsMap.cs
@@ -23,7 +23,7 @@ public class WindowItemsMap
         private bool dirty;
         private bool loadedFromFile;
         private Point currentWindowPosition;
-        private static readonly ILogger Logger = CoreAppXmlConfiguration.Instance.LoggerFactory.Create(typeof(WindowItemsMap));
+        private static readonly ILogger Logger = CoreConfigurationLocator.Get().LoggerFactory.Create(typeof(WindowItemsMap));
 
         protected WindowItemsMap()
         {
@@ -127,7 +127,7 @@ private static Point Offset(Point point, double xOffset, double yOffset)
 
         private static string FileLocation(InitializeOption initializeOption)
         {
-            return string.Format(@"{0}\{1}.xml", CoreAppXmlConfiguration.Instance.WorkSessionLocation, initializeOption.Identifier);
+            return string.Format(@"{0}\{1}.xml", CoreConfigurationLocator.Get().WorkSessionLocation, initializeOption.Identifier);
         }
 
         public virtual void Save()
diff --git a/src/TestStack.White/Sessions/WindowSession.cs b/src/TestStack.White/Sessions/WindowSession.cs
index fc81f9fe..2c2fe4c3 100644
--- a/src/TestStack.White/Sessions/WindowSession.cs
+++ b/src/TestStack.White/Sessions/WindowSession.cs
@@ -19,7 +19,7 @@ public class WindowSession : IDisposable
         private readonly ApplicationSession applicationSession;
         private readonly WindowItemsMap windowItemsMap;
         private readonly InitializeOption initializeOption;
-        private readonly ILogger logger = CoreAppXmlConfiguration.Instance.LoggerFactory.Create(typeof(WindowSession));
+        private readonly ILogger logger = CoreConfigurationLocator.Get().LoggerFactory.Create(typeof(WindowSession));
 
         public WindowSession(ApplicationSession applicationSession, InitializeOption initializeOption)
         {
diff --git a/src/TestStack.White/SystemExtensions/IntExtensions.cs b/src/TestStack.White/SystemExtensions/IntExtensions.cs
new file mode 100644
index 00000000..e81c2742
--- /dev/null
+++ b/src/TestStack.White/SystemExtensions/IntExtensions.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace TestStack.White.SystemExtensions
+{
+    public static class IntExtensions
+    {
+        public static TimeSpan AsTimeSpan(this int timeSpanInMilliseconds)
+        {
+            return TimeSpan.FromMilliseconds(timeSpanInMilliseconds);
+        }
+    }
+}
diff --git a/src/TestStack.White/TestStack.White.csproj b/src/TestStack.White/TestStack.White.csproj
index 33424ddc..06a13499 100644
--- a/src/TestStack.White/TestStack.White.csproj
+++ b/src/TestStack.White/TestStack.White.csproj
@@ -88,12 +88,18 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Application.cs" />
-    <Compile Include="Bricks\AssemblyConfiguration.cs" />
     <Compile Include="Bricks\DelegateInvoker.cs" />
     <Compile Include="Bricks\IInterceptContext.cs" />
     <Compile Include="Bricks\DynamicProxyGenerator.cs" />
     <Compile Include="Bricks\DynamicProxyInterceptors.cs" />
-    <Compile Include="Configuration\ConfigurationExtensions.cs" />
+    <Compile Include="Configuration\CoreConfiguration.cs" />
+    <Compile Include="Configuration\CoreConfigurationLocator.cs" />
+    <Compile Include="Configuration\IConfiguration.cs" />
+    <Compile Include="Configuration\Readers\AppConfigReader.cs" />
+    <Compile Include="Configuration\ConfigurationBase.cs" />
+    <Compile Include="Configuration\Readers\IConfigurationReader.cs" />
+    <Compile Include="Configuration\UIItemIdConfiguration.cs" />
+    <Compile Include="Configuration\UIItemIdConfigurationLocator.cs" />
     <Compile Include="Configuration\WhiteDefaultLogger.cs" />
     <Compile Include="Configuration\WhiteDefaultLoggerFactory.cs" />
     <Compile Include="Drawing\ScreenRectangle.cs" />
@@ -115,11 +121,7 @@
     <Compile Include="AutomationElementSearch\ElementSearchResult.cs" />
     <Compile Include="AutomationException.cs" />
     <Compile Include="CacheMode.cs" />
-    <Compile Include="Configuration\CoreAppXmlConfiguration.cs" />
-    <Compile Include="Configuration\ICoreConfiguration.cs" />
     <Compile Include="Configuration\IWaitHook.cs" />
-    <Compile Include="Configuration\UIItemIdAppXmlConfiguration.cs" />
-    <Compile Include="Configuration\IUIItemIdConfiguration.cs" />
     <Compile Include="Constants.cs" />
     <Compile Include="Debug.cs" />
     <Compile Include="Desktop.cs" />
@@ -159,6 +161,7 @@
     <Compile Include="ScreenMap\WindowsAutomationTypesSurrogates.cs" />
     <Compile Include="Span.cs" />
     <Compile Include="SystemExtensions\DoubleX.cs" />
+    <Compile Include="SystemExtensions\IntExtensions.cs" />
     <Compile Include="SystemExtensions\RectangleExtensions.cs" />
     <Compile Include="SystemExtensions\TypeExtensions.cs" />
     <Compile Include="UIA\AutomationElementCollectionX.cs" />
diff --git a/src/TestStack.White/UIA/AutomationElementX.cs b/src/TestStack.White/UIA/AutomationElementX.cs
index 48b72e98..fe70f395 100644
--- a/src/TestStack.White/UIA/AutomationElementX.cs
+++ b/src/TestStack.White/UIA/AutomationElementX.cs
@@ -12,7 +12,7 @@ namespace TestStack.White.UIA
 {
     public static class AutomationElementX
     {
-        private static readonly ILogger Logger = CoreAppXmlConfiguration.Instance.LoggerFactory.Create(typeof (AutomationElementX));
+        private static readonly ILogger Logger = CoreConfigurationLocator.Get().LoggerFactory.Create(typeof (AutomationElementX));
         private static readonly Dictionary<Type, AutomationPattern> AutomationPatterns = new Dictionary<Type, AutomationPattern>();
 
         public static string Display(this AutomationElement automationElement)
diff --git a/src/TestStack.White/UIItems/Actions/ProcessActionListener.cs b/src/TestStack.White/UIItems/Actions/ProcessActionListener.cs
index c154beda..871e3840 100644
--- a/src/TestStack.White/UIItems/Actions/ProcessActionListener.cs
+++ b/src/TestStack.White/UIItems/Actions/ProcessActionListener.cs
@@ -18,7 +18,7 @@ public virtual void ActionPerforming(UIItem uiItem) {}
 
         public virtual void ActionPerformed(Action action)
         {
-            process.WaitForInputIdle(CoreAppXmlConfiguration.Instance.BusyTimeout);
+            process.WaitForInputIdle(CoreConfigurationLocator.Get().BusyTimeout);
         }
     }
 }
\ No newline at end of file
diff --git a/src/TestStack.White/UIItems/DateTimePicker.cs b/src/TestStack.White/UIItems/DateTimePicker.cs
index 2a087341..ccc124d1 100644
--- a/src/TestStack.White/UIItems/DateTimePicker.cs
+++ b/src/TestStack.White/UIItems/DateTimePicker.cs
@@ -26,7 +26,7 @@ public virtual DateTime? Date
             }
             set
             {
-                SetDate(value, CoreAppXmlConfiguration.Instance.DefaultDateFormat);
+                SetDate(value, CoreConfigurationLocator.Get().DefaultDateFormat);
             }
         }
 
diff --git a/src/TestStack.White/UIItems/ListBoxItems/ComboBox.cs b/src/TestStack.White/UIItems/ListBoxItems/ComboBox.cs
index b76e6ee1..4e995d1f 100644
--- a/src/TestStack.White/UIItems/ListBoxItems/ComboBox.cs
+++ b/src/TestStack.White/UIItems/ListBoxItems/ComboBox.cs
@@ -95,7 +95,7 @@ public override ListItems Items
 
         public virtual bool Expand()
         {
-            if (CoreAppXmlConfiguration.Instance.ComboBoxItemsPopulatedWithoutDropDownOpen) return false;
+            if (CoreConfigurationLocator.Get().ComboBoxItemsPopulatedWithoutDropDownOpen) return false;
             if (!Enabled) return false;
 
             var ecp = AutomationElement.GetPattern<ExpandCollapsePattern>();
diff --git a/src/TestStack.White/UIItems/ListBoxItems/ListItem.cs b/src/TestStack.White/UIItems/ListBoxItems/ListItem.cs
index 3ebee982..b690a97c 100644
--- a/src/TestStack.White/UIItems/ListBoxItems/ListItem.cs
+++ b/src/TestStack.White/UIItems/ListBoxItems/ListItem.cs
@@ -48,7 +48,7 @@ public virtual void Select(bool shouldSelect)
                 WaitForBoundsToStabilise(this);
                 mouse.Click(Bounds.ImmediateInteriorEast(), actionListener);
 
-                var timeout = TimeSpan.FromMilliseconds(CoreAppXmlConfiguration.Instance.ComboBoxItemSelectionTimeout);
+                var timeout = TimeSpan.FromMilliseconds(CoreConfigurationLocator.Get().ComboBoxItemSelectionTimeout);
                 if (!Retry.For(() => IsSelected, timeout))
                 {
                     Logger.Debug("Failed to select list item via click. Falling back to automation patterns");
diff --git a/src/TestStack.White/UIItems/ListBoxItems/SilverlightComboBoxVerticalSpanCalculator.cs b/src/TestStack.White/UIItems/ListBoxItems/SilverlightComboBoxVerticalSpanCalculator.cs
index 8b82667c..e9840b9d 100644
--- a/src/TestStack.White/UIItems/ListBoxItems/SilverlightComboBoxVerticalSpanCalculator.cs
+++ b/src/TestStack.White/UIItems/ListBoxItems/SilverlightComboBoxVerticalSpanCalculator.cs
@@ -10,7 +10,7 @@ public class SilverlightComboBoxVerticalSpanCalculator
         private readonly Rect lastItem;
         private readonly Rect combo;
         private readonly double percentVisible;
-        private readonly ILogger logger = CoreAppXmlConfiguration.Instance.LoggerFactory.Create(typeof(SilverlightComboBoxVerticalSpanCalculator));
+        private readonly ILogger logger = CoreConfigurationLocator.Get().LoggerFactory.Create(typeof(SilverlightComboBoxVerticalSpanCalculator));
 
         public SilverlightComboBoxVerticalSpanCalculator(Rect combo, Rect firstItem, Rect lastItem, double percentVisible)
         {
diff --git a/src/TestStack.White/UIItems/ListBoxItems/WPFComboBoxVerticalSpanCalculator.cs b/src/TestStack.White/UIItems/ListBoxItems/WPFComboBoxVerticalSpanCalculator.cs
index acd2fa76..532e68d6 100644
--- a/src/TestStack.White/UIItems/ListBoxItems/WPFComboBoxVerticalSpanCalculator.cs
+++ b/src/TestStack.White/UIItems/ListBoxItems/WPFComboBoxVerticalSpanCalculator.cs
@@ -10,7 +10,7 @@ public class WPFComboBoxVerticalSpanCalculator
         private readonly Rect lastItem;
         private readonly Rect combo;
         private readonly double percentVisible;
-        private readonly ILogger logger = CoreAppXmlConfiguration.Instance.LoggerFactory.Create(typeof(WPFComboBoxVerticalSpanCalculator));
+        private readonly ILogger logger = CoreConfigurationLocator.Get().LoggerFactory.Create(typeof(WPFComboBoxVerticalSpanCalculator));
 
         public WPFComboBoxVerticalSpanCalculator(Rect combo, Rect firstItem, Rect lastItem, double percentVisible)
         {
diff --git a/src/TestStack.White/UIItems/ListViewItems/SuggestionListView.cs b/src/TestStack.White/UIItems/ListViewItems/SuggestionListView.cs
index c8df411a..48e435e6 100644
--- a/src/TestStack.White/UIItems/ListViewItems/SuggestionListView.cs
+++ b/src/TestStack.White/UIItems/ListViewItems/SuggestionListView.cs
@@ -2,6 +2,7 @@
 using System.Windows.Automation;
 using TestStack.White.AutomationElementSearch;
 using TestStack.White.Configuration;
+using TestStack.White.SystemExtensions;
 using TestStack.White.UIItems.Actions;
 using TestStack.White.Utility;
 
@@ -30,7 +31,7 @@ private static ISuggestionList WaitTill(IActionListener actionListener, string f
         {
             try
             {
-                return Retry.For(() => Find(actionListener), shouldRetry, CoreAppXmlConfiguration.Instance.SuggestionListTimeout());
+                return Retry.For(() => Find(actionListener), shouldRetry, CoreConfigurationLocator.Get().SuggestionListTimeout.AsTimeSpan());
             }
             catch (Exception ex)
             {
diff --git a/src/TestStack.White/UIItems/MenuItems/Menus.cs b/src/TestStack.White/UIItems/MenuItems/Menus.cs
index 0df072cc..fffcdeb3 100644
--- a/src/TestStack.White/UIItems/MenuItems/Menus.cs
+++ b/src/TestStack.White/UIItems/MenuItems/Menus.cs
@@ -6,6 +6,7 @@
 using TestStack.White.AutomationElementSearch;
 using TestStack.White.Configuration;
 using TestStack.White.Factory;
+using TestStack.White.SystemExtensions;
 using TestStack.White.UIItems.Actions;
 using TestStack.White.UIItems.Finders;
 using TestStack.White.Utility;
@@ -21,7 +22,7 @@ public Menus(AutomationElement parent, IActionListener actionListener)
             if (parent == null) throw new ArgumentNullException("parent", "You must specify a parent automation id when creating a menu");
             AutomationSearchCondition condition = AutomationSearchCondition.ByControlType(ControlType.MenuItem);
             var finder = new AutomationElementFinder(parent);
-            finder = Retry.For(()=> PerformanceHackAsPopupMenuForWin32AppComesOnDesktop(finder, parent), CoreAppXmlConfiguration.Instance.BusyTimeout());
+            finder = Retry.For(()=> PerformanceHackAsPopupMenuForWin32AppComesOnDesktop(finder, parent), CoreConfigurationLocator.Get().BusyTimeout.AsTimeSpan());
             List<AutomationElement> children = finder.Descendants(condition);
             foreach (AutomationElement child in children)
                 Add((Menu) Factory.Create(child, actionListener));
diff --git a/src/TestStack.White/UIItems/Scrolling/ScreenItem.cs b/src/TestStack.White/UIItems/Scrolling/ScreenItem.cs
index 0a0749dd..4a93b8c1 100644
--- a/src/TestStack.White/UIItems/Scrolling/ScreenItem.cs
+++ b/src/TestStack.White/UIItems/Scrolling/ScreenItem.cs
@@ -1,6 +1,7 @@
-using System;
 using Castle.Core.Logging;
+using System;
 using TestStack.White.Configuration;
+using TestStack.White.SystemExtensions;
 using TestStack.White.Utility;
 
 namespace TestStack.White.UIItems.Scrolling
@@ -9,7 +10,7 @@ public class ScreenItem
     {
         private readonly UIItem uiItem;
         private readonly IVScrollBar verticalScroll;
-        private readonly ILogger logger = CoreAppXmlConfiguration.Instance.LoggerFactory.Create(typeof(ScreenItem));
+        private readonly ILogger logger = CoreConfigurationLocator.Get().LoggerFactory.Create(typeof(ScreenItem));
 
         public ScreenItem(UIItem uiItem, IScrollBars scrollBars)
         {
@@ -58,7 +59,7 @@ internal virtual void MakeVisible(IVerticalSpanProvider verticalSpanProvider)
                     const string messageFormat = "Trying to make {0} visible, item's bounds are {1} and parent's span is {2}";
                     logger.DebugFormat(messageFormat, uiItem, bounds, verticalSpan);
                     return verticalSpan.Contains(bounds);
-                }, CoreAppXmlConfiguration.Instance.BusyTimeout(), TimeSpan.FromMilliseconds(0));
+                }, CoreConfigurationLocator.Get().BusyTimeout.AsTimeSpan(), TimeSpan.FromMilliseconds(0));
 
             if (!success)
             throw new UIActionException(string.Format("Could not make the {0} visible{1}", uiItem, Constants.BusyMessage));
diff --git a/src/TestStack.White/UIItems/Scrolling/ScrollBar.cs b/src/TestStack.White/UIItems/Scrolling/ScrollBar.cs
index e80431cf..58544734 100644
--- a/src/TestStack.White/UIItems/Scrolling/ScrollBar.cs
+++ b/src/TestStack.White/UIItems/Scrolling/ScrollBar.cs
@@ -3,6 +3,7 @@
 using TestStack.White.AutomationElementSearch;
 using TestStack.White.Configuration;
 using TestStack.White.Factory;
+using TestStack.White.SystemExtensions;
 using TestStack.White.UIItems.Actions;
 using TestStack.White.UIItems.Finders;
 using TestStack.White.Utility;
@@ -53,7 +54,7 @@ public virtual void SetToMinimum()
             {
                 BackLargeChangeButton.Click();
                 return Value;
-            }, v => v > 0, CoreAppXmlConfiguration.Instance.BusyTimeout(), TimeSpan.FromMilliseconds(0));
+            }, v => v > 0, CoreConfigurationLocator.Get().BusyTimeout.AsTimeSpan(), TimeSpan.FromMilliseconds(0));
 
             if (value > 0)
                 throw new UIActionException(string.Format("Could not set the ScrollBar to minimum visible{0}", Constants.BusyMessage));
diff --git a/src/TestStack.White/UIItems/Scrolling/ScrollBars.cs b/src/TestStack.White/UIItems/Scrolling/ScrollBars.cs
index 8da5d90c..2fd6e416 100644
--- a/src/TestStack.White/UIItems/Scrolling/ScrollBars.cs
+++ b/src/TestStack.White/UIItems/Scrolling/ScrollBars.cs
@@ -27,7 +27,7 @@ public override IHScrollBar Horizontal {
         protected virtual IHScrollBar FindHorizontalBar(FindElement findElement) {
             AutomationElement horizontalScrollElement =
                 findElement(
-                    AutomationSearchCondition.ByAutomationId(UIItemIdAppXmlConfiguration.Instance.HorizontalScrollBar).OfControlType(
+                    AutomationSearchCondition.ByAutomationId(UIItemIdConfigurationLocator.Get().HorizontalScrollBar).OfControlType(
                         ControlType.ScrollBar));
             if (horizontalScrollElement == null) {
                 return new NullHScrollBar();
@@ -42,7 +42,7 @@ public override IVScrollBar Vertical {
         protected virtual IVScrollBar FindVerticalBar(FindElement findElement) {
             AutomationElement verticalScrollElement =
                 findElement(
-                    AutomationSearchCondition.ByAutomationId(UIItemIdAppXmlConfiguration.Instance.VerticalScrollBar).OfControlType(
+                    AutomationSearchCondition.ByAutomationId(UIItemIdConfigurationLocator.Get().VerticalScrollBar).OfControlType(
                         ControlType.ScrollBar));
             if (verticalScrollElement == null) {
                 return new NullVScrollBar();
diff --git a/src/TestStack.White/UIItems/TableItems/Table.cs b/src/TestStack.White/UIItems/TableItems/Table.cs
index 49a61b9a..e5cdadc0 100644
--- a/src/TestStack.White/UIItems/TableItems/Table.cs
+++ b/src/TestStack.White/UIItems/TableItems/Table.cs
@@ -33,7 +33,7 @@ public virtual TableHeader Header
             {
                 if (header == null)
                 {
-                    AutomationElement headerElement = finder.Descendant(SearchCriteria.ByText(UIItemIdAppXmlConfiguration.Instance.TableHeader).AutomationCondition);
+                    AutomationElement headerElement = finder.Descendant(SearchCriteria.ByText(UIItemIdConfigurationLocator.Get().TableHeader).AutomationCondition);
                     if (headerElement == null) return null;
                     header = (TableHeader) new TableHeaderFactory().Create(headerElement, actionListener);
                 }
diff --git a/src/TestStack.White/UIItems/TableItems/TableCell.cs b/src/TestStack.White/UIItems/TableItems/TableCell.cs
index 0f94ccc4..c43d5496 100644
--- a/src/TestStack.White/UIItems/TableItems/TableCell.cs
+++ b/src/TestStack.White/UIItems/TableItems/TableCell.cs
@@ -18,7 +18,7 @@ public virtual object Value
             get
             {
                 object value = Property(ValuePattern.ValueProperty);
-                return UIItemIdAppXmlConfiguration.Instance.TableCellNullValue.Equals(value) ? string.Empty : value;
+                return UIItemIdConfigurationLocator.Get().TableCellNullValue.Equals(value) ? string.Empty : value;
             }
             set
             {
diff --git a/src/TestStack.White/UIItems/TableItems/TableColumns.cs b/src/TestStack.White/UIItems/TableItems/TableColumns.cs
index 03283ad2..dce1ad64 100644
--- a/src/TestStack.White/UIItems/TableItems/TableColumns.cs
+++ b/src/TestStack.White/UIItems/TableItems/TableColumns.cs
@@ -21,7 +21,7 @@ public TableColumns(IEnumerable<AutomationElement> automationElements, IActionLi
 
         private static bool HeaderColumn(AutomationElement automationElement)
         {
-            return automationElement.GetCurrentPropertyValue(AutomationElement.NameProperty).Equals(UIItemIdAppXmlConfiguration.Instance.TableTopLeftHeaderCell);
+            return automationElement.GetCurrentPropertyValue(AutomationElement.NameProperty).Equals(UIItemIdConfigurationLocator.Get().TableTopLeftHeaderCell);
         }
 
         public virtual TableColumn this[string text]
diff --git a/src/TestStack.White/UIItems/TableItems/TableHeader.cs b/src/TestStack.White/UIItems/TableItems/TableHeader.cs
index ff1cefe9..e99a5fb9 100644
--- a/src/TestStack.White/UIItems/TableItems/TableHeader.cs
+++ b/src/TestStack.White/UIItems/TableItems/TableHeader.cs
@@ -19,7 +19,7 @@ public virtual TableColumns Columns
                 var descendants = new AutomationElementFinder(automationElement)
                     .Descendants(AutomationSearchCondition.ByControlType(ControlType.Header));
                 var columnElements = new List<AutomationElement>(descendants)
-                    .FindAll(obj => !obj.Current.Name.StartsWith(UIItemIdAppXmlConfiguration.Instance.TableColumn));
+                    .FindAll(obj => !obj.Current.Name.StartsWith(UIItemIdConfigurationLocator.Get().TableColumn));
                 return new TableColumns(columnElements, actionListener);
             }
         }
diff --git a/src/TestStack.White/UIItems/TableItems/TableScrollBars.cs b/src/TestStack.White/UIItems/TableItems/TableScrollBars.cs
index 800e1723..435a84c9 100644
--- a/src/TestStack.White/UIItems/TableItems/TableScrollBars.cs
+++ b/src/TestStack.White/UIItems/TableItems/TableScrollBars.cs
@@ -13,11 +13,11 @@ public class TableScrollBars : AbstractScrollBars
 
         public TableScrollBars(AutomationElementFinder finder, IActionListener actionListener, ITableVerticalScrollOffset tableVerticalScrollOffset)
         {
-            AutomationElement verticalScrollElement = finder.Child(AutomationSearchCondition.ByControlType(ControlType.ScrollBar).WithName(UIItemIdAppXmlConfiguration.Instance.TableVerticalScrollBar));
+            AutomationElement verticalScrollElement = finder.Child(AutomationSearchCondition.ByControlType(ControlType.ScrollBar).WithName(UIItemIdConfigurationLocator.Get().TableVerticalScrollBar));
             verticalScrollBar = (verticalScrollElement == null)
                                     ? (IVScrollBar) new NullVScrollBar()
                                     : new TableVerticalScrollBar(verticalScrollElement, actionListener, tableVerticalScrollOffset);
-            AutomationElement horizontalScrollElement = finder.Child(AutomationSearchCondition.ByControlType(ControlType.ScrollBar).WithName(UIItemIdAppXmlConfiguration.Instance.TableHorizontalScrollBar));
+            AutomationElement horizontalScrollElement = finder.Child(AutomationSearchCondition.ByControlType(ControlType.ScrollBar).WithName(UIItemIdConfigurationLocator.Get().TableHorizontalScrollBar));
             horizontalScrollBar = (horizontalScrollElement == null)
                                       ? (IHScrollBar) new NullHScrollBar()
                                       : new TableHorizontalScrollBar(horizontalScrollElement, actionListener);
diff --git a/src/TestStack.White/UIItems/TooltipSafeMouse.cs b/src/TestStack.White/UIItems/TooltipSafeMouse.cs
index b0a72429..905d0389 100644
--- a/src/TestStack.White/UIItems/TooltipSafeMouse.cs
+++ b/src/TestStack.White/UIItems/TooltipSafeMouse.cs
@@ -11,7 +11,7 @@ namespace TestStack.White.UIItems
     internal class TooltipSafeMouse
     {
         private readonly Mouse mouse;
-        private readonly ILogger logger = CoreAppXmlConfiguration.Instance.LoggerFactory.Create(typeof(TooltipSafeMouse));
+        private readonly ILogger logger = CoreConfigurationLocator.Get().LoggerFactory.Create(typeof(TooltipSafeMouse));
 
         public TooltipSafeMouse(Mouse mouse)
         {
@@ -64,7 +64,7 @@ private ToolTip GetToolTip(UIItem uiItem, IActionListener actionListener)
         {
             mouse.Click(uiItem.Bounds.Center());
             actionListener.ActionPerformed(Action.WindowMessage);
-            Thread.Sleep(CoreAppXmlConfiguration.Instance.TooltipWaitTime);
+            Thread.Sleep(CoreConfigurationLocator.Get().TooltipWaitTime);
             return ToolTip.GetFrom(uiItem.Bounds.Center());
         }
     }
diff --git a/src/TestStack.White/UIItems/UIItem.cs b/src/TestStack.White/UIItems/UIItem.cs
index 5e2fe1e0..553c80d6 100644
--- a/src/TestStack.White/UIItems/UIItem.cs
+++ b/src/TestStack.White/UIItems/UIItem.cs
@@ -36,7 +36,7 @@ public class UIItem : IUIItem
         internal readonly Keyboard keyboard = Keyboard.Instance;
         protected IScrollBars scrollBars;
         private AutomationEventHandler handler;
-        protected readonly ILogger Logger = CoreAppXmlConfiguration.Instance.LoggerFactory.Create(typeof(UIItem));
+        protected readonly ILogger Logger = CoreConfigurationLocator.Get().LoggerFactory.Create(typeof(UIItem));
 
         #endregion
 
@@ -586,7 +586,7 @@ public virtual T GetPattern<T>() where T : BasePattern
         private void PerformIfValid(System.Action action)
         {
             var startTime = DateTime.Now;
-            var busyTimeout = CoreAppXmlConfiguration.Instance.BusyTimeout / 1000;
+            var busyTimeout = CoreConfigurationLocator.Get().BusyTimeout / 1000;
             while (DateTime.Now.Subtract(startTime).TotalSeconds < busyTimeout)
             {
                 if (Enabled && !IsOffScreen)
diff --git a/src/TestStack.White/UIItems/UIItemCollection.cs b/src/TestStack.White/UIItems/UIItemCollection.cs
index 13ad463a..f6be5a9a 100644
--- a/src/TestStack.White/UIItems/UIItemCollection.cs
+++ b/src/TestStack.White/UIItems/UIItemCollection.cs
@@ -15,7 +15,7 @@ namespace TestStack.White.UIItems
     public class UIItemCollection : List<IUIItem>
     {
         private static readonly DictionaryMappedItemFactory DictionaryMappedItemFactory = new DictionaryMappedItemFactory();
-        private readonly ILogger logger = CoreAppXmlConfiguration.Instance.LoggerFactory.Create(typeof(UIItemCollection));
+        private readonly ILogger logger = CoreConfigurationLocator.Get().LoggerFactory.Create(typeof(UIItemCollection));
 
         public UIItemCollection(params UIItem[] uiItems)
         {
diff --git a/src/TestStack.White/UIItems/UIItemContainer.cs b/src/TestStack.White/UIItems/UIItemContainer.cs
index 687bf768..c79f3ab8 100644
--- a/src/TestStack.White/UIItems/UIItemContainer.cs
+++ b/src/TestStack.White/UIItems/UIItemContainer.cs
@@ -1,14 +1,15 @@
+using Castle.DynamicProxy;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Windows.Automation;
-using Castle.DynamicProxy;
 using TestStack.White.Configuration;
 using TestStack.White.Factory;
 using TestStack.White.InputDevices;
 using TestStack.White.Interceptors;
 using TestStack.White.Sessions;
+using TestStack.White.SystemExtensions;
 using TestStack.White.UIA;
 using TestStack.White.UIItems.Actions;
 using TestStack.White.UIItems.Container;
@@ -36,7 +37,8 @@ protected UIItemContainer()
 
         public UIItemContainer(AutomationElement automationElement, IActionListener actionListener,
             InitializeOption initializeOption,
-            WindowSession windowSession) : base(automationElement, actionListener)
+            WindowSession windowSession)
+            : base(automationElement, actionListener)
         {
             WindowSession = windowSession;
             CurrentContainerItemFactory = new CurrentContainerItemFactory(factory, initializeOption, automationElement,
@@ -49,7 +51,7 @@ public UIItemContainer(AutomationElement automationElement, IActionListener acti
         }
 
         #endregion
-        
+
         /// <summary>
         /// Implements <see cref="IUIItemContainer.ToolTip" />
         /// </summary>
@@ -91,7 +93,7 @@ public virtual T Get<T>(string primaryIdentification) where T : IUIItem
         /// </summary>
         public virtual T Get<T>(SearchCriteria searchCriteria) where T : IUIItem
         {
-            return (T) Get(searchCriteria.AndControlType(typeof (T), Framework));
+            return (T)Get(searchCriteria.AndControlType(typeof(T), Framework));
         }
 
         /// <summary>
@@ -99,7 +101,7 @@ public virtual T Get<T>(SearchCriteria searchCriteria) where T : IUIItem
         /// </summary>
         public virtual IUIItem Get(SearchCriteria searchCriteria)
         {
-            return Get(searchCriteria, CoreAppXmlConfiguration.Instance.BusyTimeout());
+            return Get(searchCriteria, CoreConfigurationLocator.Get().BusyTimeout.AsTimeSpan());
         }
 
         /// <summary>
@@ -112,7 +114,7 @@ public virtual IUIItem Get(SearchCriteria searchCriteria, TimeSpan busyTimeout)
                 var uiItem = Retry.For(() =>
                     CurrentContainerItemFactory.Find(searchCriteria, WindowSession),
                     b =>
-                        (bool) b.AutomationElement.GetCurrentPropertyValue(AutomationElement.IsOffscreenProperty, false),
+                        (bool)b.AutomationElement.GetCurrentPropertyValue(AutomationElement.IsOffscreenProperty, false),
                     busyTimeout);
 
                 if (uiItem == null)
@@ -254,7 +256,7 @@ public virtual AttachedMouse Mouse
 
         public virtual MenuBar MenuBar
         {
-            get { return (MenuBar) Get(SearchCriteria.ForMenuBar(Framework)); }
+            get { return (MenuBar)Get(SearchCriteria.ForMenuBar(Framework)); }
         }
 
         public virtual List<MenuBar> MenuBars
@@ -267,7 +269,7 @@ public virtual ToolStrip ToolStrip
             get
             {
                 Focus();
-                return (ToolStrip) Get(SearchCriteria.ByControlType(ControlType.ToolBar));
+                return (ToolStrip)Get(SearchCriteria.ByControlType(ControlType.ToolBar));
             }
         }
 
@@ -308,12 +310,12 @@ public virtual void ReInitialize(InitializeOption option)
 
         public virtual MenuBar GetMenuBar(SearchCriteria searchCriteria)
         {
-            return (MenuBar) Get(SearchCriteria.ForMenuBar(Framework).Merge(searchCriteria));
+            return (MenuBar)Get(SearchCriteria.ForMenuBar(Framework).Merge(searchCriteria));
         }
 
         public virtual ToolStrip GetToolStrip(string primaryIdentification)
         {
-            var toolStrip = (ToolStrip) Get(SearchCriteria.ByAutomationId(primaryIdentification));
+            var toolStrip = (ToolStrip)Get(SearchCriteria.ByAutomationId(primaryIdentification));
             if (toolStrip == null) return null;
             toolStrip.Associate(WindowSession);
             return toolStrip;
@@ -348,8 +350,8 @@ private void HandleIfCustomUIItem(IUIItem uiItem)
             var interceptorField = customUIItem.GetType().GetField("__interceptors",
                 BindingFlags.NonPublic | BindingFlags.Public |
                 BindingFlags.Instance);
-            var interceptors = (IInterceptor[]) interceptorField.GetValue(customUIItem);
-            var realCustomUIItem = (CustomUIItem) ((CoreInterceptor) interceptors[0]).Context.UiItem;
+            var interceptors = (IInterceptor[])interceptorField.GetValue(customUIItem);
+            var realCustomUIItem = (CustomUIItem)((CoreInterceptor)interceptors[0]).Context.UiItem;
             realCustomUIItem.SetContainer(new UIItemContainer(customUIItem.AutomationElement, ChildrenActionListener,
                 InitializeOption.NoCache, WindowSession));
         }
@@ -370,9 +372,9 @@ protected virtual IActionListener ChildrenActionListener
 
         protected virtual void CustomWait()
         {
-            if (CoreAppXmlConfiguration.Instance.AdditionalWaitHook != null)
+            if (CoreConfigurationLocator.Get().AdditionalWaitHook != null)
             {
-                CoreAppXmlConfiguration.Instance.AdditionalWaitHook.WaitFor(this);
+                CoreConfigurationLocator.Get().AdditionalWaitHook.WaitFor(this);
             }
         }
 
diff --git a/src/TestStack.White/UIItems/WindowItems/Window.cs b/src/TestStack.White/UIItems/WindowItems/Window.cs
index 0c5a3f63..afdd5645 100644
--- a/src/TestStack.White/UIItems/WindowItems/Window.cs
+++ b/src/TestStack.White/UIItems/WindowItems/Window.cs
@@ -14,6 +14,7 @@
 using TestStack.White.InputDevices;
 using TestStack.White.Recording;
 using TestStack.White.Sessions;
+using TestStack.White.SystemExtensions;
 using TestStack.White.UIA;
 using TestStack.White.UIItems.Actions;
 using TestStack.White.UIItems.Finders;
@@ -81,7 +82,7 @@ private void InitializeWindow()
                     Title, Bounds, bounds);
             }
             WindowSession.Register(this);
-            
+
             var hwnd = new IntPtr(automationElement.Current.NativeWindowHandle);
             int ownerProcessId;
             ownerThreadId = NativeWindow.GetWindowThreadProcessId(hwnd, out ownerProcessId);
@@ -206,7 +207,7 @@ public virtual void WaitWhileBusy()
 
         protected static void HourGlassWait()
         {
-            if (!CoreAppXmlConfiguration.Instance.WaitBasedOnHourGlass) return;
+            if (!CoreConfigurationLocator.Get().WaitBasedOnHourGlass) return;
             try
             {
                 Retry.For(() => InputDevices.Mouse.Instance.Cursor,
@@ -214,12 +215,12 @@ protected static void HourGlassWait()
                           {
                               if (MouseCursor.WaitCursors.Contains(cursor))
                               {
-                                  if (CoreAppXmlConfiguration.Instance.MoveMouseToGetStatusOfHourGlass)
+                                  if (CoreConfigurationLocator.Get().MoveMouseToGetStatusOfHourGlass)
                                       InputDevices.Mouse.Instance.MoveOut();
                                   return true;
                               }
                               return false;
-                          }, CoreAppXmlConfiguration.Instance.BusyTimeout());
+                          }, CoreConfigurationLocator.Get().BusyTimeout.AsTimeSpan());
             }
             catch (Exception)
             {
@@ -300,7 +301,7 @@ public override void Visit(IWindowControlVisitor windowControlVisitor)
         /// <exception cref="UIActionException">when methods reached the timeout</exception>
         public virtual void WaitTill(WaitTillDelegate waitTillDelegate)
         {
-            WaitTill(waitTillDelegate, CoreAppXmlConfiguration.Instance.BusyTimeout());
+            WaitTill(waitTillDelegate, CoreConfigurationLocator.Get().BusyTimeout.AsTimeSpan());
         }
 
         /// <exception cref="UIActionException">when methods reached the timeout</exception>
@@ -362,7 +363,7 @@ public override string ToString()
 
         public virtual void Dispose()
         {
-            if (!CoreAppXmlConfiguration.Instance.KeepOpenOnDispose)
+            if (!CoreConfigurationLocator.Get().KeepOpenOnDispose)
             {
                 Close();
             }
diff --git a/src/TestStack.White/Utility/Retry.cs b/src/TestStack.White/Utility/Retry.cs
index 67681151..1e9e1f57 100644
--- a/src/TestStack.White/Utility/Retry.cs
+++ b/src/TestStack.White/Utility/Retry.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Threading;
 using TestStack.White.Configuration;
+using TestStack.White.SystemExtensions;
 using TestStack.White.UIItems.WindowItems;
 
 namespace TestStack.White.Utility
@@ -15,7 +16,7 @@ public static class Retry
         /// <param name="getMethod">The operation to perform.</param>
         public static Window ForDefault(Func<Window> getMethod)
         {
-            return For(getMethod, CoreAppXmlConfiguration.Instance.FindWindowTimeout());
+            return For(getMethod, CoreConfigurationLocator.Get().FindWindowTimeout.AsTimeSpan());
         }
 
         /// <summary>
@@ -25,7 +26,7 @@ public static Window ForDefault(Func<Window> getMethod)
         /// <param name="shouldRetry">The predicate used for retry.</param>
         public static Window ForDefault(Func<Window> getMethod, Predicate<Window> shouldRetry)
         {
-            return For(getMethod, shouldRetry, CoreAppXmlConfiguration.Instance.FindWindowTimeout());
+            return For(getMethod, shouldRetry, CoreConfigurationLocator.Get().FindWindowTimeout.AsTimeSpan());
         }
 
         /// <summary>
@@ -34,7 +35,7 @@ public static Window ForDefault(Func<Window> getMethod, Predicate<Window> should
         /// <param name="getMethod">The operation to perform.</param>
         public static T ForDefault<T>(Func<T> getMethod)
         {
-            return For(getMethod, CoreAppXmlConfiguration.Instance.BusyTimeout());
+            return For(getMethod, CoreConfigurationLocator.Get().BusyTimeout.AsTimeSpan());
         }
 
         /// <summary>
@@ -44,7 +45,7 @@ public static T ForDefault<T>(Func<T> getMethod)
         /// <param name="shouldRetry">The predicate used for retry.</param>
         public static T ForDefault<T>(Func<T> getMethod, Predicate<T> shouldRetry)
         {
-            return For(getMethod, shouldRetry, CoreAppXmlConfiguration.Instance.BusyTimeout());
+            return For(getMethod, shouldRetry, CoreConfigurationLocator.Get().BusyTimeout.AsTimeSpan());
         }
 
         /// <summary>