Update to match MessageHandler generic param change