Added entities and services related to data consolidation (indicators,
activity data, etc.) (previous push was not complete)