more changes made to the time aggregation components