Added time grouping options