refactoring of configuration classes