Adding support for multiple fieldsets. Refs. #22