Added level and removed TODO in NextListener.