Update old listener to new API