Move more stuff to config