Registration refactoring.