Continue working on the CLI tool, SQL features