Enhance registration