Reorganized segment definitions.