Added support for additional properties.