Improve type hints