More type hints in generation