[D&I] Change approach a bit
Add BNF for Déjà Vu grammar