Removed relation for period. Added parameters in DataCollector to allow different periods to be aggregated over.