Updated to TypeScript compliance.