Adding Postgres changes for the Workspace to work. Work remains to be done for ORacle.