Updated/New Composer support for SQL_Parser

See diff for full changes