Refactored MSMQ implementation