Adapted croquis Postgres DAO to new database schemas organization