Made message dispatcher work with hubs