Add csv and json dumper, clean evaluation