Should this be CellAnnotations rather than KVAnnotations?