Refactoring; Config setup