Improved message dispatching