Refactoring: Resolve TODOs in types/index.ts