Add some type hints