Improved "dump" functions