SQLParser edits