Fixing generate fields helper.
Fixing orders.
Using the new generate fields.