Few changes to Segmenter