Move some stuff to the loader file