Add initial support for multivalued attributes