Refactored some registration methods