Folded start_date/end_date into options per @herval