Separated the registration with/without LMP