Updated EF version of listener