Changes for SQL Parsing