diff --git a/.idea/misc.xml b/.idea/misc.xml
index e32f2d98..f9efc1d4 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -10,6 +10,7 @@
         <option value="$PROJECT_DIR$/pom.xml" />
       </list>
     </option>
+    <option name="workspaceImportForciblyTurnedOn" value="true" />
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/config-magic/pom.xml b/config-magic/pom.xml
index 93bd8022..a083eec6 100644
--- a/config-magic/pom.xml
+++ b/config-magic/pom.xml
@@ -66,7 +66,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <!-- Don't run JUnit tests -->
-                    <groups />
+                    <groups/>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/config-magic/src/main/java/org/skife/config/ConfigReplacements.java b/config-magic/src/main/java/org/skife/config/ConfigReplacements.java
index e1bbbd53..fca721a8 100644
--- a/config-magic/src/main/java/org/skife/config/ConfigReplacements.java
+++ b/config-magic/src/main/java/org/skife/config/ConfigReplacements.java
@@ -24,7 +24,7 @@
 
 /**
  * If a configuration bean is created with mapped replacement values via
- * {@link ConfigurationObjectFactory#buildWithReplacements(Class, java.util.Map)},
+ * {@link AugmentedConfigurationObjectFactory#buildWithReplacements(Class, java.util.Map)},
  * this annotation designates a method which should present the provided Map.
  * The map may not be changed and is not necessarily the same instance as the original.
  * If a key is provided, the return is instead the value for that key.
diff --git a/config-magic/src/main/java/org/skife/config/ConfigurationObjectFactory.java b/config-magic/src/main/java/org/skife/config/ConfigurationObjectFactory.java
index 42e823c0..a02b64f5 100755
--- a/config-magic/src/main/java/org/skife/config/ConfigurationObjectFactory.java
+++ b/config-magic/src/main/java/org/skife/config/ConfigurationObjectFactory.java
@@ -19,14 +19,17 @@
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Properties;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/config-magic/src/main/java/org/skife/config/RuntimeConfigRegistry.java b/config-magic/src/main/java/org/skife/config/RuntimeConfigRegistry.java
index be79893d..65a546f7 100644
--- a/config-magic/src/main/java/org/skife/config/RuntimeConfigRegistry.java
+++ b/config-magic/src/main/java/org/skife/config/RuntimeConfigRegistry.java
@@ -69,4 +69,9 @@ public static Map<String, String> getAll() {
     public static Map<String, Map<String, String>> getAllBySource() {
         return Collections.unmodifiableMap(RUNTIME_CONFIGS_BY_SOURCE);
     }
+
+    public static void clear() {
+        RUNTIME_CONFIGS.clear();
+        RUNTIME_CONFIGS_BY_SOURCE.clear();
+    }
 }
diff --git a/config-magic/src/test/java/org/skife/config/TestArrays.java b/config-magic/src/test/java/org/skife/config/TestArrays.java
index 74bfa7be..b8017055 100644
--- a/config-magic/src/test/java/org/skife/config/TestArrays.java
+++ b/config-magic/src/test/java/org/skife/config/TestArrays.java
@@ -28,11 +28,11 @@
 @Category(ConfigMagicTests.class)
 public class TestArrays {
 
-    private ConfigurationObjectFactory cof;
+    private AugmentedConfigurationObjectFactory cof;
 
     @Before
     public void setUp() {
-        cof = new ConfigurationObjectFactory(new Properties());
+        cof = new AugmentedConfigurationObjectFactory(new Properties());
     }
 
     @After
diff --git a/config-magic/src/test/java/org/skife/config/TestBadConfig.java b/config-magic/src/test/java/org/skife/config/TestBadConfig.java
index 7ea3beeb..4923d2e9 100644
--- a/config-magic/src/test/java/org/skife/config/TestBadConfig.java
+++ b/config-magic/src/test/java/org/skife/config/TestBadConfig.java
@@ -27,11 +27,11 @@
 @Category(ConfigMagicTests.class)
 public class TestBadConfig {
 
-    ConfigurationObjectFactory c = null;
+    AugmentedConfigurationObjectFactory c = null;
 
     @Before
     public void setUp() {
-        this.c = new ConfigurationObjectFactory(new Properties());
+        this.c = new AugmentedConfigurationObjectFactory(new Properties());
     }
 
     @After
diff --git a/config-magic/src/test/java/org/skife/config/TestCaseInsensitiveEnumCoercible.java b/config-magic/src/test/java/org/skife/config/TestCaseInsensitiveEnumCoercible.java
index f7448f11..040ac96f 100644
--- a/config-magic/src/test/java/org/skife/config/TestCaseInsensitiveEnumCoercible.java
+++ b/config-magic/src/test/java/org/skife/config/TestCaseInsensitiveEnumCoercible.java
@@ -29,7 +29,7 @@ public class TestCaseInsensitiveEnumCoercible {
 
     @Test
     public void testHappyPath() throws Exception {
-        final ConfigurationObjectFactory cof = new ConfigurationObjectFactory(Props.of("creamer", "half_and_half"));
+        final AugmentedConfigurationObjectFactory cof = new AugmentedConfigurationObjectFactory(Props.of("creamer", "half_and_half"));
 
         final Coffee coffee = cof.build(Coffee.class);
         assertThat(coffee.getCreamer(), equalTo(Creamer.HALF_AND_HALF));
@@ -37,7 +37,7 @@ public void testHappyPath() throws Exception {
 
     @Test(expected = IllegalStateException.class)
     public void testNoMatch() throws Exception {
-        final ConfigurationObjectFactory cof = new ConfigurationObjectFactory(Props.of("creamer", "goat_milk"));
+        final AugmentedConfigurationObjectFactory cof = new AugmentedConfigurationObjectFactory(Props.of("creamer", "goat_milk"));
 
         final Coffee coffee = cof.build(Coffee.class);
         fail("should have raised an illegal state exception");
@@ -45,7 +45,7 @@ public void testNoMatch() throws Exception {
 
     @Test(expected = IllegalArgumentException.class)
     public void testExactMatch() throws Exception {
-        final ConfigurationObjectFactory cof = new ConfigurationObjectFactory(Props.of("creamer", "whole_milk"));
+        final ConfigurationObjectFactory cof = new AugmentedConfigurationObjectFactory(Props.of("creamer", "whole_milk"));
         cof.addCoercible(new ExactMatchEnumCoercible());
 
         final Coffee coffee = cof.build(Coffee.class);
diff --git a/config-magic/src/test/java/org/skife/config/TestClasses.java b/config-magic/src/test/java/org/skife/config/TestClasses.java
index 8406052b..c816584c 100644
--- a/config-magic/src/test/java/org/skife/config/TestClasses.java
+++ b/config-magic/src/test/java/org/skife/config/TestClasses.java
@@ -30,100 +30,100 @@ public class TestClasses {
 
     @Test
     public void testRawType() {
-        final WithRawType config = new ConfigurationObjectFactory(Props.of("theClazz", Object.class.getName())).build(WithRawType.class);
+        final WithRawType config = new AugmentedConfigurationObjectFactory(Props.of("theClazz", Object.class.getName())).build(WithRawType.class);
 
         Assert.assertEquals(config.getTheClazz(), Object.class);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void testRawTypeNotFound() {
-        new ConfigurationObjectFactory(Props.of("theClazz", "does.not.Exist")).build(WithRawType.class);
+        new AugmentedConfigurationObjectFactory(Props.of("theClazz", "does.not.Exist")).build(WithRawType.class);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void testRawTypeIllegal() {
-        new ConfigurationObjectFactory(Props.of("theClazz", "not a class")).build(WithRawType.class);
+        new AugmentedConfigurationObjectFactory(Props.of("theClazz", "not a class")).build(WithRawType.class);
     }
 
     @Test
     public void testRawTypeWithDefault() {
-        final WithRawTypeAndDefault config = new ConfigurationObjectFactory(new Properties()).build(WithRawTypeAndDefault.class);
+        final WithRawTypeAndDefault config = new AugmentedConfigurationObjectFactory(new Properties()).build(WithRawTypeAndDefault.class);
 
         Assert.assertEquals(config.getTheClazz(), Object.class);
     }
 
     @Test
     public void testRawTypeWithNullDefault() {
-        final WithRawType config = new ConfigurationObjectFactory(new Properties()).build(WithRawType.class);
+        final WithRawType config = new AugmentedConfigurationObjectFactory(new Properties()).build(WithRawType.class);
 
         Assert.assertNull(config.getTheClazz());
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void testRawTypeWithNotFoundDefault() {
-        new ConfigurationObjectFactory(new Properties()).build(WithRawTypeAndUndefinedDefault.class);
+        new AugmentedConfigurationObjectFactory(new Properties()).build(WithRawTypeAndUndefinedDefault.class);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void testRawTypeWithIllegalDefault() {
-        new ConfigurationObjectFactory(new Properties()).build(WithRawTypeAndIllegalDefault.class);
+        new AugmentedConfigurationObjectFactory(new Properties()).build(WithRawTypeAndIllegalDefault.class);
     }
 
     @Test
     public void testUnspecifiedType() {
-        final WithUnspecifiedType config = new ConfigurationObjectFactory(Props.of("theClazz", Foo.class.getName())).build(WithUnspecifiedType.class);
+        final WithUnspecifiedType config = new AugmentedConfigurationObjectFactory(Props.of("theClazz", Foo.class.getName())).build(WithUnspecifiedType.class);
 
         Assert.assertEquals(config.getTheClazz(), Foo.class);
     }
 
     @Test
     public void testExtends() {
-        final WithExtends config = new ConfigurationObjectFactory(Props.of("theClazz", Foo.class.getName())).build(WithExtends.class);
+        final WithExtends config = new AugmentedConfigurationObjectFactory(Props.of("theClazz", Foo.class.getName())).build(WithExtends.class);
 
         Assert.assertEquals(config.getTheClazz(), Foo.class);
     }
 
     @Test
     public void testExtendsWithSubClass() {
-        final WithExtends config = new ConfigurationObjectFactory(Props.of("theClazz", FooSub.class.getName())).build(WithExtends.class);
+        final WithExtends config = new AugmentedConfigurationObjectFactory(Props.of("theClazz", FooSub.class.getName())).build(WithExtends.class);
 
         Assert.assertEquals(config.getTheClazz(), FooSub.class);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void testExtendsWithSuperClass() {
-        new ConfigurationObjectFactory(Props.of("theClazz", FooSuper.class.getName())).build(WithExtends.class);
+        new AugmentedConfigurationObjectFactory(Props.of("theClazz", FooSuper.class.getName())).build(WithExtends.class);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void testExtendsWithUnrelatedClass() {
-        new ConfigurationObjectFactory(Props.of("theClazz", Properties.class.getName())).build(WithExtends.class);
+        new AugmentedConfigurationObjectFactory(Props.of("theClazz", Properties.class.getName())).build(WithExtends.class);
     }
 
     @Test
     public void testNestedExtends() {
-        final WithNestedExtends config = new ConfigurationObjectFactory(Props.of("theClazz", FooList.class.getName())).build(WithNestedExtends.class);
+        final WithNestedExtends config = new AugmentedConfigurationObjectFactory(Props.of("theClazz", FooList.class.getName())).build(WithNestedExtends.class);
 
         Assert.assertEquals(config.getTheClazz(), FooList.class);
     }
 
     @Test
     public void testNestedExtendsWithSubClass() {
-        final WithNestedExtends config = new ConfigurationObjectFactory(Props.of("theClazz", FooSubList.class.getName())).build(WithNestedExtends.class);
+        final WithNestedExtends config = new AugmentedConfigurationObjectFactory(Props.of("theClazz", FooSubList.class.getName())).build(WithNestedExtends.class);
 
         Assert.assertEquals(config.getTheClazz(), FooSubList.class);
     }
 
     @Test
     public void testNestedExtendsWithSuperClass() {
-        final WithNestedExtends config = new ConfigurationObjectFactory(Props.of("theClazz", FooSuperList.class.getName())).build(WithNestedExtends.class);
+        final WithNestedExtends config = new AugmentedConfigurationObjectFactory(Props.of("theClazz", FooSuperList.class.getName())).build(WithNestedExtends.class);
 
         Assert.assertEquals(config.getTheClazz(), FooSuperList.class);
     }
 
     @Test
     public void testNestedExtendsWithUnrelatedClass() {
-        final WithNestedExtends config = new ConfigurationObjectFactory(Props.of("theClazz", StringList.class.getName())).build(WithNestedExtends.class);
+        final WithNestedExtends config = new AugmentedConfigurationObjectFactory(Props.of("theClazz", StringList.class.getName())).build(WithNestedExtends.class);
 
         Assert.assertEquals(config.getTheClazz(), StringList.class);
     }
diff --git a/config-magic/src/test/java/org/skife/config/TestCoercion.java b/config-magic/src/test/java/org/skife/config/TestCoercion.java
index e66dadac..f9d1fc62 100644
--- a/config-magic/src/test/java/org/skife/config/TestCoercion.java
+++ b/config-magic/src/test/java/org/skife/config/TestCoercion.java
@@ -31,11 +31,11 @@
 @Category(ConfigMagicTests.class)
 public class TestCoercion {
 
-    private ConfigurationObjectFactory c = null;
+    private AugmentedConfigurationObjectFactory c = null;
 
     @Before
     public void setUp() {
-        this.c = new ConfigurationObjectFactory(new Properties() {{
+        this.c = new AugmentedConfigurationObjectFactory(new Properties() {{
             setProperty("the-url", "http://github.org/brianm/config-magic");
         }});
     }
diff --git a/config-magic/src/test/java/org/skife/config/TestCollections.java b/config-magic/src/test/java/org/skife/config/TestCollections.java
index 082aeb10..4293ef66 100644
--- a/config-magic/src/test/java/org/skife/config/TestCollections.java
+++ b/config-magic/src/test/java/org/skife/config/TestCollections.java
@@ -35,11 +35,11 @@
 @Category(ConfigMagicTests.class)
 public class TestCollections {
 
-    private ConfigurationObjectFactory cof;
+    private AugmentedConfigurationObjectFactory cof;
 
     @Before
     public void setUp() {
-        cof = new ConfigurationObjectFactory(new Properties());
+        cof = new AugmentedConfigurationObjectFactory(new Properties());
     }
 
     @After
diff --git a/config-magic/src/test/java/org/skife/config/TestConfigurationObjectFactory.java b/config-magic/src/test/java/org/skife/config/TestConfigurationObjectFactory.java
index 0ac2a097..f962ab72 100755
--- a/config-magic/src/test/java/org/skife/config/TestConfigurationObjectFactory.java
+++ b/config-magic/src/test/java/org/skife/config/TestConfigurationObjectFactory.java
@@ -36,7 +36,7 @@ public class TestConfigurationObjectFactory {
 
     @Test
     public void testMultipleReplacements() throws Exception {
-        final ConfigurationObjectFactory c = new ConfigurationObjectFactory(new Properties() {{
+        final ConfigurationObjectFactory c = new AugmentedConfigurationObjectFactory(new Properties() {{
             setProperty("another-option.a.1", "A1");
             setProperty("another-option.a.2", "A2");
             setProperty("another-option.b.1", "B1");
@@ -71,7 +71,7 @@ public void testMultipleReplacements() throws Exception {
     public void testReplacement() throws Exception {
         final Map<String, String> replacementsMap = new HashMap<String, String>();
         replacementsMap.put("type", "first");
-        final ConfigurationObjectFactory c = new ConfigurationObjectFactory(new Properties() {{
+        final ConfigurationObjectFactory c = new AugmentedConfigurationObjectFactory(new Properties() {{
             setProperty("option.first", "1st");
             setProperty("option.second", "2nd");
         }});
@@ -85,7 +85,7 @@ public void testReplacement() throws Exception {
 
     @Test
     public void testFoo() throws Exception {
-        final ConfigurationObjectFactory c = new ConfigurationObjectFactory(new Properties() {{
+        final ConfigurationObjectFactory c = new AugmentedConfigurationObjectFactory(new Properties() {{
             setProperty("hello", "world");
             setProperty("theValue", "value");
         }});
@@ -95,7 +95,7 @@ public void testFoo() throws Exception {
 
     @Test
     public void testEnum() throws Exception {
-        final ConfigurationObjectFactory c = new ConfigurationObjectFactory(new Properties() {{
+        final ConfigurationObjectFactory c = new AugmentedConfigurationObjectFactory(new Properties() {{
             setProperty("option.one", "1");
             setProperty("option.two", "2");
         }});
@@ -107,7 +107,7 @@ public void testEnum() throws Exception {
 
     @Test
     public void testMultiParameters() throws Exception {
-        final ConfigurationObjectFactory c = new ConfigurationObjectFactory(new Properties() {{
+        final ConfigurationObjectFactory c = new AugmentedConfigurationObjectFactory(new Properties() {{
             setProperty("another-option.one.a", "1-x");
             setProperty("another-option.two.b", "2-y");
         }});
@@ -119,21 +119,21 @@ public void testMultiParameters() throws Exception {
 
     @Test
     public void testDefaultValue() throws Exception {
-        final ConfigurationObjectFactory c = new ConfigurationObjectFactory(new Properties());
+        final ConfigurationObjectFactory c = new AugmentedConfigurationObjectFactory(new Properties());
         final Thing t = c.build(Thing.class);
         assertEquals(t.getName(), "woof");
     }
 
     @Test
     public void testDefaultViaImpl() throws Exception {
-        final ConfigurationObjectFactory c = new ConfigurationObjectFactory(new Properties());
+        final ConfigurationObjectFactory c = new AugmentedConfigurationObjectFactory(new Properties());
         final Config2 config = c.build(Config2.class);
         assertEquals(config.getOption(), "default");
     }
 
     @Test
     public void testProvidedOverridesDefault() throws Exception {
-        final ConfigurationObjectFactory c = new ConfigurationObjectFactory(new Properties() {{
+        final ConfigurationObjectFactory c = new AugmentedConfigurationObjectFactory(new Properties() {{
             setProperty("option", "provided");
         }});
 
@@ -143,7 +143,7 @@ public void testProvidedOverridesDefault() throws Exception {
 
     @Test
     public void testMissingDefault() throws Exception {
-        final ConfigurationObjectFactory c = new ConfigurationObjectFactory(new Properties());
+        final ConfigurationObjectFactory c = new AugmentedConfigurationObjectFactory(new Properties());
         try {
             c.build(Config3.class);
             fail("Expected exception due to missing value");
@@ -153,7 +153,7 @@ public void testMissingDefault() throws Exception {
 
     @Test
     public void testDetectsAbstractMethod() throws Exception {
-        final ConfigurationObjectFactory c = new ConfigurationObjectFactory(new Properties());
+        final ConfigurationObjectFactory c = new AugmentedConfigurationObjectFactory(new Properties());
         try {
             c.build(Config4.class);
             fail("Expected exception due to abstract method without @Config annotation");
@@ -163,7 +163,7 @@ public void testDetectsAbstractMethod() throws Exception {
 
     @Test
     public void testTypes() {
-        final ConfigurationObjectFactory c = new ConfigurationObjectFactory(new Properties() {{
+        final ConfigurationObjectFactory c = new AugmentedConfigurationObjectFactory(new Properties() {{
             setProperty("stringOption", "a string");
             setProperty("booleanOption", "true");
             setProperty("boxedBooleanOption", "true");
diff --git a/config-magic/src/test/java/org/skife/config/TestCustomCoercion.java b/config-magic/src/test/java/org/skife/config/TestCustomCoercion.java
index 2b136650..4270b028 100644
--- a/config-magic/src/test/java/org/skife/config/TestCustomCoercion.java
+++ b/config-magic/src/test/java/org/skife/config/TestCustomCoercion.java
@@ -32,7 +32,7 @@ public class TestCustomCoercion {
 
     @Test(expected = IllegalStateException.class)
     public void testNoConverterConfig() {
-        final ConfigurationObjectFactory c = new ConfigurationObjectFactory(new Properties() {{
+        final ConfigurationObjectFactory c = new AugmentedConfigurationObjectFactory(new Properties() {{
             setProperty("the-url", "http://github.org/brianm/config-magic");
         }});
 
@@ -41,7 +41,7 @@ public void testNoConverterConfig() {
 
     @Test
     public void testWithConverterConfig() {
-        final ConfigurationObjectFactory c = new ConfigurationObjectFactory(new Properties() {{
+        final ConfigurationObjectFactory c = new AugmentedConfigurationObjectFactory(new Properties() {{
             setProperty("the-url", "http://github.org/brianm/config-magic");
         }});
 
diff --git a/config-magic/src/test/java/org/skife/config/TestDataAmount.java b/config-magic/src/test/java/org/skife/config/TestDataAmount.java
index 88543b52..d584cb7f 100644
--- a/config-magic/src/test/java/org/skife/config/TestDataAmount.java
+++ b/config-magic/src/test/java/org/skife/config/TestDataAmount.java
@@ -28,11 +28,11 @@
 @Category(ConfigMagicTests.class)
 public class TestDataAmount {
 
-    private ConfigurationObjectFactory cof;
+    private AugmentedConfigurationObjectFactory cof;
 
     @Before
     public void setUp() {
-        cof = new ConfigurationObjectFactory(new Properties());
+        cof = new AugmentedConfigurationObjectFactory(new Properties());
     }
 
     @After
diff --git a/config-magic/src/test/java/org/skife/config/TestDefaultNull.java b/config-magic/src/test/java/org/skife/config/TestDefaultNull.java
index 945c2906..a0157e8c 100644
--- a/config-magic/src/test/java/org/skife/config/TestDefaultNull.java
+++ b/config-magic/src/test/java/org/skife/config/TestDefaultNull.java
@@ -28,11 +28,11 @@
 @Category(ConfigMagicTests.class)
 public class TestDefaultNull {
 
-    private ConfigurationObjectFactory cof = null;
+    private AugmentedConfigurationObjectFactory cof = null;
 
     @Before
     public void setUp() {
-        cof = new ConfigurationObjectFactory(new Properties());
+        cof = new AugmentedConfigurationObjectFactory(new Properties());
     }
 
     @After
diff --git a/config-magic/src/test/java/org/skife/config/TestDefaultsPresent.java b/config-magic/src/test/java/org/skife/config/TestDefaultsPresent.java
index 698941db..d26bf851 100644
--- a/config-magic/src/test/java/org/skife/config/TestDefaultsPresent.java
+++ b/config-magic/src/test/java/org/skife/config/TestDefaultsPresent.java
@@ -28,11 +28,11 @@
 @Category(ConfigMagicTests.class)
 public class TestDefaultsPresent {
 
-    private ConfigurationObjectFactory cof = null;
+    private AugmentedConfigurationObjectFactory cof = null;
 
     @Before
     public void setUp() {
-        cof = new ConfigurationObjectFactory(new Properties());
+        cof = new AugmentedConfigurationObjectFactory(new Properties());
     }
 
     @After
diff --git a/config-magic/src/test/java/org/skife/config/TestEmptyValue.java b/config-magic/src/test/java/org/skife/config/TestEmptyValue.java
index c32b1972..e79dd84a 100644
--- a/config-magic/src/test/java/org/skife/config/TestEmptyValue.java
+++ b/config-magic/src/test/java/org/skife/config/TestEmptyValue.java
@@ -28,11 +28,11 @@
 @Category(ConfigMagicTests.class)
 public class TestEmptyValue {
 
-    private ConfigurationObjectFactory cof = null;
+    private AugmentedConfigurationObjectFactory cof = null;
 
     @Before
     public void setUp() {
-        cof = new ConfigurationObjectFactory(new Properties());
+        cof = new AugmentedConfigurationObjectFactory(new Properties());
     }
 
     @After
diff --git a/config-magic/src/test/java/org/skife/config/TestEnums.java b/config-magic/src/test/java/org/skife/config/TestEnums.java
index e522dd90..bef1975b 100644
--- a/config-magic/src/test/java/org/skife/config/TestEnums.java
+++ b/config-magic/src/test/java/org/skife/config/TestEnums.java
@@ -28,11 +28,11 @@
 @Category(ConfigMagicTests.class)
 public class TestEnums {
 
-    private ConfigurationObjectFactory cof;
+    private AugmentedConfigurationObjectFactory cof;
 
     @Before
     public void setUp() {
-        cof = new ConfigurationObjectFactory(new Properties());
+        cof = new AugmentedConfigurationObjectFactory(new Properties());
     }
 
     @After
diff --git a/config-magic/src/test/java/org/skife/config/TestExposeMappedReplacements.java b/config-magic/src/test/java/org/skife/config/TestExposeMappedReplacements.java
index 3470c33a..0761b8fb 100644
--- a/config-magic/src/test/java/org/skife/config/TestExposeMappedReplacements.java
+++ b/config-magic/src/test/java/org/skife/config/TestExposeMappedReplacements.java
@@ -35,7 +35,7 @@ public void testExposeReplacements() {
         final Properties properties = new Properties();
         properties.put("wat.1", "xyzzy");
 
-        final ConfigurationObjectFactory factory = new ConfigurationObjectFactory(properties);
+        final ConfigurationObjectFactory factory = new AugmentedConfigurationObjectFactory(properties);
         final Map<String, String> map = new HashMap<String, String>();
 
         map.put("a", "1");
@@ -48,7 +48,7 @@ public void testExposeReplacements() {
 
     @Test
     public void testNoReplacements() {
-        final ConfigurationObjectFactory factory = new ConfigurationObjectFactory(new Properties());
+        final ConfigurationObjectFactory factory = new AugmentedConfigurationObjectFactory(new Properties());
 
         final ReplacementConfig config = factory.build(ReplacementConfig.class);
         assertTrue(config.getMap().isEmpty());
@@ -56,7 +56,7 @@ public void testNoReplacements() {
 
     @Test
     public void testKeyReplacement() {
-        final ConfigurationObjectFactory factory = new ConfigurationObjectFactory(new Properties());
+        final ConfigurationObjectFactory factory = new AugmentedConfigurationObjectFactory(new Properties());
         final Map<String, String> map = new HashMap<String, String>();
 
         map.put("a", "1");
@@ -69,7 +69,7 @@ public void testKeyReplacement() {
 
     @Test
     public void testDefaultValues() {
-        final ConfigurationObjectFactory factory = new ConfigurationObjectFactory(new Properties());
+        final ConfigurationObjectFactory factory = new AugmentedConfigurationObjectFactory(new Properties());
         final ReplacementConfig config = factory.build(ReplacementConfig.class);
         assertEquals(null, config.getDefaultNull());
         assertEquals(3, config.getDefault3());
diff --git a/config-magic/src/test/java/org/skife/config/TestFile.java b/config-magic/src/test/java/org/skife/config/TestFile.java
index 32b3e506..a12dbe00 100644
--- a/config-magic/src/test/java/org/skife/config/TestFile.java
+++ b/config-magic/src/test/java/org/skife/config/TestFile.java
@@ -29,11 +29,11 @@
 @Category(ConfigMagicTests.class)
 public class TestFile {
 
-    private ConfigurationObjectFactory cof;
+    private AugmentedConfigurationObjectFactory cof;
 
     @Before
     public void setUp() {
-        cof = new ConfigurationObjectFactory(new Properties() {{
+        cof = new AugmentedConfigurationObjectFactory(new Properties() {{
             setProperty("file2", "..");
         }});
     }
diff --git a/config-magic/src/test/java/org/skife/config/TestMultiConfig.java b/config-magic/src/test/java/org/skife/config/TestMultiConfig.java
index 8525d220..84537bbc 100644
--- a/config-magic/src/test/java/org/skife/config/TestMultiConfig.java
+++ b/config-magic/src/test/java/org/skife/config/TestMultiConfig.java
@@ -31,11 +31,11 @@
 @Category(ConfigMagicTests.class)
 public class TestMultiConfig {
 
-    ConfigurationObjectFactory c = null;
+    AugmentedConfigurationObjectFactory c = null;
 
     @Before
     public void setUp() {
-        this.c = new ConfigurationObjectFactory(new Properties() {{
+        this.c = new AugmentedConfigurationObjectFactory(new Properties() {{
             setProperty("singleOption", "the-single-value");
             setProperty("multiOption1", "the-multi-option1-value");
             setProperty("multiOption2", "the-multi-option2-value");
diff --git a/config-magic/src/test/java/org/skife/config/TestNoFinal.java b/config-magic/src/test/java/org/skife/config/TestNoFinal.java
index 84e616d8..8c581e65 100644
--- a/config-magic/src/test/java/org/skife/config/TestNoFinal.java
+++ b/config-magic/src/test/java/org/skife/config/TestNoFinal.java
@@ -27,7 +27,7 @@ public class TestNoFinal {
 
     @Test(expected = IllegalArgumentException.class)
     public void testExplodeOnFinal() {
-        final ConfigurationObjectFactory cof = new ConfigurationObjectFactory(new Properties());
+        final ConfigurationObjectFactory cof = new AugmentedConfigurationObjectFactory(new Properties());
         cof.build(EmptyClass.class);
     }
 
diff --git a/config-magic/src/test/java/org/skife/config/TestTimeSpan.java b/config-magic/src/test/java/org/skife/config/TestTimeSpan.java
index 0fdc34c1..f31d2484 100644
--- a/config-magic/src/test/java/org/skife/config/TestTimeSpan.java
+++ b/config-magic/src/test/java/org/skife/config/TestTimeSpan.java
@@ -29,11 +29,11 @@
 @Category(ConfigMagicTests.class)
 public class TestTimeSpan {
 
-    private ConfigurationObjectFactory cof;
+    private AugmentedConfigurationObjectFactory cof;
 
     @Before
     public void setUp() {
-        cof = new ConfigurationObjectFactory(new Properties());
+        cof = new AugmentedConfigurationObjectFactory(new Properties());
     }
 
     @After
diff --git a/config-magic/src/test/java/org/skife/config/TestVariousPropertyTypes.java b/config-magic/src/test/java/org/skife/config/TestVariousPropertyTypes.java
index c5d175d8..bfe363dd 100644
--- a/config-magic/src/test/java/org/skife/config/TestVariousPropertyTypes.java
+++ b/config-magic/src/test/java/org/skife/config/TestVariousPropertyTypes.java
@@ -28,7 +28,7 @@
 @Category(ConfigMagicTests.class)
 public class TestVariousPropertyTypes {
 
-    private ConfigurationObjectFactory c = null;
+    private AugmentedConfigurationObjectFactory c = null;
     private StrangeConfig sc = null;
 
     @Before
@@ -39,7 +39,7 @@ public void setUp() {
         p.setProperty("double.second.property", "double-second-value");
         p.setProperty("test.value.property", "test-value-value");
         p.setProperty("test.default.property", "test-default-value");
-        c = new ConfigurationObjectFactory(p);
+        c = new AugmentedConfigurationObjectFactory(p);
         sc = c.buildWithReplacements(StrangeConfig.class, Collections.singletonMap("key", "value"));
     }
 
diff --git a/metrics-api/pom.xml b/metrics-api/pom.xml
index b8327328..7637b2c5 100644
--- a/metrics-api/pom.xml
+++ b/metrics-api/pom.xml
@@ -27,5 +27,5 @@
     <properties>
         <check.spotbugs-exclude-filter-file>spotbugs-exclude.xml</check.spotbugs-exclude-filter-file>
     </properties>
-    <dependencies />
+    <dependencies/>
 </project>
diff --git a/pom.xml b/pom.xml
index 6de288a1..f9302465 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-oss-parent</artifactId>
-        <version>0.146.54</version>
+        <version>0.146.59</version>
     </parent>
     <groupId>org.kill-bill.commons</groupId>
     <artifactId>killbill-commons</artifactId>
diff --git a/queue/src/test/java/org/killbill/TestSetup.java b/queue/src/test/java/org/killbill/TestSetup.java
index 718fd5b3..bd957321 100644
--- a/queue/src/test/java/org/killbill/TestSetup.java
+++ b/queue/src/test/java/org/killbill/TestSetup.java
@@ -39,8 +39,8 @@
 import org.killbill.commons.utils.io.Resources;
 import org.killbill.notificationq.api.NotificationQueueConfig;
 import org.killbill.queue.InTransaction;
-import org.skife.config.AugmentedConfigurationObjectFactory;
 import org.skife.config.ConfigSource;
+import org.skife.config.AugmentedConfigurationObjectFactory;
 import org.skife.config.SimplePropertyConfigSource;
 import org.skife.jdbi.v2.DBI;
 import org.testng.annotations.AfterClass;
diff --git a/skeleton/src/main/java/org/killbill/commons/skeleton/modules/ConfigModule.java b/skeleton/src/main/java/org/killbill/commons/skeleton/modules/ConfigModule.java
index 6308af4f..f25fa7c1 100644
--- a/skeleton/src/main/java/org/killbill/commons/skeleton/modules/ConfigModule.java
+++ b/skeleton/src/main/java/org/killbill/commons/skeleton/modules/ConfigModule.java
@@ -23,8 +23,8 @@
 import java.util.List;
 import java.util.Properties;
 
-import org.skife.config.AugmentedConfigurationObjectFactory;
 import org.skife.config.ConfigSource;
+import org.skife.config.AugmentedConfigurationObjectFactory;
 import org.skife.config.SimplePropertyConfigSource;
 
 import com.google.inject.AbstractModule;