Added support for non-primitive attributes.