Moved event listener registration to annotation