Reworked model property type definition