Validation and Segmentation improvements