Registration refactoring, added user capabilities.