Refactoring of the registration concept