Fix listener interface
Fix wrong placed annotation