Updates for PostgreSQL handling
Update with latest state