More work in PostgresqlClient