Move some config stuff into the config