Added some more TypeScript annotations