Change context listener into event