Added support for delayed and cancelled trains