added TS support