#2 - added use of builders inside BaselineServiceImpl and some toXXX methods on the collection builders