Updates for TS v1.1