Converted project to TypeScript