Added ArrivalCalculator