Move stuff to config functions