Moved more configuration to config file