Update to support postgreSQL (3)