Add support for instance based property data