Refined all CRF to include all variables as indicated in the latest CRFs