Added a few type hints