Regenerated according to latest schema