CFY-1318 interfaces changes