Added type hints