Add more typing.
Generation fix.
Add more typings.