Added support for properties.