Update dependencies and refactor code for improved type safety