MessageQueue was improved but it still needs some confirmations :/