Add modifications to support JBoss A-MQ