Common registration type

Common registration type
Bug fixes

Bug fixes