Add support for field groups to the Form component