Added support for TypeScript