Change to new JCPI API