added handler registrion to listener callbacks