Converted message queues to heap message queues