Updated the listener with 3.0 Annotation to self register