CFR core-refactored and converted to 5.0