Modification to support properties.