Fix registration refactor