Improved message handlers.