Reverted to enums to define property types