Added typescript integration