CFY-807 use execution constants