[Configuration class] - refactoring