Some config classes refactored