Refactoring of the configuration generation system