Added Events and JMS