Small improvements to registering stuff, makes it more modulized and easier to find