More work on adding Postgres support