Working on prolog-based DB + NUOPC7 changes