Improve type hint