Modified configs
Refactoring