Add more type hints