Added some type hints