ACTIVEMQ6-4 - more refactoring