Updated SQL dumper to be stable