Compatibily with the new annotations component