Change add-to-activities datastructure to make it work in short term