More changes for Segment by Segment refactoring.