Client registration refactoring