EquivalentDataProperties support added