#45: Refactoring of CF