Registration refactoring