Updated segment class