Move stuff to config.extra