Extended DSL parser to support event definitions