Continue separating responsibilities into different collaborators