Moved config items to config file