Replaced java bean objects and DAOs with the ones in CollaborationService