Added CAFF configuration too