added support for properties.