Update to include multiselect