Added syntax check support