CFY-972 refactoring