Added support for segmented annotations