Support for hourly granularity - need some testing