Refactoring schema registration