Make changes DBMS agnostic, moved all queries to the adapter
Improved cl interface