Would it be worth creating a AggregateActivity model in model.js, perhaps inheriting from Activity, so we can more explicitly use aggregate as a type?