Regenerate after datatype removal.
Update with latest changes.