Also improve the detection of type/classifier when validating properties