Moved registering to its own header