Segmentation improvements