Added support for group and extern_ref fields