DDF-619: Modified eventListener