BNF enhanced