We are striving for a broader BPMN2.0 conformance , hence we started using some different paradigms in the browser modeler. This includes the change to the modelling of events. I would encourage you to evaluate if the browser-based modeler would not also suit your purposes.