Updated to support TS 0.8.2