Added fieldset support