Performance optimizations in /arrivals