TODO Store reporting time as zoned date time to have correct time buckets in aggregations Convert currently stored data Avoid having two update processes during deployment