Moved some additional configuration params into the config file