Support for AnnotateCms framework