JMS-6: Added factory support