Added segment selection support