Improved TS Definition; Implemented Composite TS