BAP-6083: Add collaborators, track activities