Improve it so we can add dynamic fields.
Improve it so we can add dynamic fields.