Added ContinuityHandler