Updated collection mapper to be more generic e.g. allow Sets/Lists to be used as well as Collection