Changes to activitiesclients linkage