Move some stuff to config file