Added basic syntax checking