Use new generate script