Updated syntax checking