Added Check for registration