I don't think handlerAdded() and handlerRemoved() should be annotated