Working on refactoring config