Updates for 0.10
leverage message queues