Added no_form_group option