Update syntax and parser organization