Dump & load performance improvements