HCSVLAB-459: Interim commit of the new Collection model