Updated fields and field groups