Moved more configuration to the config file