More work on PostgreSQL