Added fieldset management