Added reorganization of parser into BG-like rules