Start to update parser to new syntax