EventMapper extended