add calculated_day_count/calculated_end_at support