Changed BNF, remove methods, added fields