Move more stuff to config file