More safety for new annotations