JMS Refactoring