Use dynamic fields

Last updated