CFY-799 use modified handler api