Fix registration with new schema