[ ! ] Added group_by_30_min and some refactor