Moved some things into config