Move arrival.* to public