ActivitiesTable restructured