Refactor/improve dynamic fields/field groups