Optimal build working for non-3 datadict too.