Added fieldsets and other bits