Modified services to use lists consistently for collections, rather than a mixture of lists and sets.