Awesome config refactoring