Change ordering of CFD hash