Added option resolver to dumper