Added @nonhandler tag for listener functions