Enhancement jms refactoring