Major refactoring of configuration components