Moved config into the main config file