Refactoring: Moved CNFUtil