CFY-1444 refactoring