Improved dump builder