Add support for sortProperty