Added support for saved segments.