[ORII-94]
Type refactoring