Make the activity relationship more like a join table