UPDATE: Making config more reusable