Improve dump (again)