More refactorying to support new registration method