"Officially" added arrival/departure to model.