Added FieldGroupFactory