Table mapping changes for pgsql