updated to PostgreSQL datasource