CFY-415 refactoring