Adding support to multi-valued properties