Add handling of multiple value attributes.