Registration logic updated