improved annotation hooks