Refactoring to separate configs