data model
Merge branch 'segment_controller'