Refactored collaborators selection