CFY-72 adding feature + tests