Moving the Grammar out to make it more performant