Add skip_syntax_check feature again