CF refactoring