Add check for property subtype