Update to work with changes to csql package.