Big rework for new dumps