registration refactoring issue