Feat/registration types rebase