Typescript changes