Now supporting object properties.