First draft for activemq support