CFY-494 refactoring