Moved more things to config file