Add default scope of including stop in stop time