Early work for QHY-CFW feature