More work on CollaborationBuilder