Updated config to work with new codebase