Completed refactoring of making configuration stackable.