Support for AnnotateCms. Closes GH-74.