Refactored some config classes