Making it work bettern with the JMS