Started refactoring Schema for new SPSegment architecture