Refactor MessageHandler subscriptions