Added ability to support any property object type