handlers are now annotated automatically