Add support for annotation and annoref

They are basically treated as if they were notes