Fix for Workspace integration in postgres