Added a private QueueMessageAdapter and modified a bunch of stuff