Added some missing type hints