Add segmenting support