Added hour + day aggregation (Command and data table)