Changed CFEImpl as per latest yaon code