Added hour aggregation and more properties