Seperated to headers and increased functionality of Segment