diff --git a/client/old_versions/cdb_dataservices_client--0.10.0--0.10.1.sql b/client/old_versions/cdb_dataservices_client--0.10.0--0.10.1.sql
index 8e24d11..4209ee5 100644
--- a/client/old_versions/cdb_dataservices_client--0.10.0--0.10.1.sql
+++ b/client/old_versions/cdb_dataservices_client--0.10.0--0.10.1.sql
@@ -93,4 +93,4 @@ RETURNS boolean AS $$
                 .format(username=plpy.quote_nullable(username), orgname=plpy.quote_nullable(orgname), server_schema=plpy.quote_literal(server_schema), server_table_name=plpy.quote_literal(server_table_name), fdw_server=plpy.quote_literal(server_name))
                 )
         return False
-$$ LANGUAGE plpythonu;
\ No newline at end of file
+$$ LANGUAGE @@plpythonu@@;
\ No newline at end of file
diff --git a/client/old_versions/cdb_dataservices_client--0.10.0.sql b/client/old_versions/cdb_dataservices_client--0.10.0.sql
index a1b8fff..b3afeab 100644
--- a/client/old_versions/cdb_dataservices_client--0.10.0.sql
+++ b/client/old_versions/cdb_dataservices_client--0.10.0.sql
@@ -1277,7 +1277,7 @@ RETURNS boolean AS $$
                 .format(username=plpy.quote_nullable(username), orgname=plpy.quote_nullable(orgname), server_schema=plpy.quote_literal(server_schema), server_table_name=plpy.quote_literal(server_table_name), fdw_server=plpy.quote_literal(server_name))
                 )
         return False
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 
 
@@ -1352,7 +1352,7 @@ RETURNS boolean AS $$
                 .format(username=plpy.quote_nullable(username), orgname=plpy.quote_nullable(orgname), server_schema=plpy.quote_literal(server_schema), server_table_name=plpy.quote_literal(server_table_name), fdw_server=plpy.quote_literal(server_name))
                 )
         return False
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client._OBS_ConnectUserTable(username text, orgname text, user_db_role text, user_schema text, dbname text, table_name text)
diff --git a/client/old_versions/cdb_dataservices_client--0.10.1--0.10.0.sql b/client/old_versions/cdb_dataservices_client--0.10.1--0.10.0.sql
index 5aebf7c..87168da 100644
--- a/client/old_versions/cdb_dataservices_client--0.10.1--0.10.0.sql
+++ b/client/old_versions/cdb_dataservices_client--0.10.1--0.10.0.sql
@@ -88,4 +88,4 @@ RETURNS boolean AS $$
                 .format(username=plpy.quote_nullable(username), orgname=plpy.quote_nullable(orgname), server_schema=plpy.quote_literal(server_schema), server_table_name=plpy.quote_literal(server_table_name), fdw_server=plpy.quote_literal(server_name))
                 )
         return False
-$$ LANGUAGE plpythonu;
\ No newline at end of file
+$$ LANGUAGE @@plpythonu@@;
\ No newline at end of file
diff --git a/client/old_versions/cdb_dataservices_client--0.10.1.sql b/client/old_versions/cdb_dataservices_client--0.10.1.sql
index 274ed68..023722c 100644
--- a/client/old_versions/cdb_dataservices_client--0.10.1.sql
+++ b/client/old_versions/cdb_dataservices_client--0.10.1.sql
@@ -1282,7 +1282,7 @@ RETURNS boolean AS $$
                 .format(username=plpy.quote_nullable(username), orgname=plpy.quote_nullable(orgname), server_schema=plpy.quote_literal(server_schema), server_table_name=plpy.quote_literal(server_table_name), fdw_server=plpy.quote_literal(server_name))
                 )
         return False
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 
 
@@ -1357,7 +1357,7 @@ RETURNS boolean AS $$
                 .format(username=plpy.quote_nullable(username), orgname=plpy.quote_nullable(orgname), server_schema=plpy.quote_literal(server_schema), server_table_name=plpy.quote_literal(server_table_name), fdw_server=plpy.quote_literal(server_name))
                 )
         return False
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client._OBS_ConnectUserTable(username text, orgname text, user_db_role text, user_schema text, dbname text, table_name text)
diff --git a/client/old_versions/cdb_dataservices_client--0.10.2--0.11.0.sql b/client/old_versions/cdb_dataservices_client--0.10.2--0.11.0.sql
index 9d735a1..481bdd2 100644
--- a/client/old_versions/cdb_dataservices_client--0.10.2--0.11.0.sql
+++ b/client/old_versions/cdb_dataservices_client--0.10.2--0.11.0.sql
@@ -144,7 +144,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PrepareTableOBS_GetMeas
         )
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMeasure(
     username text,
@@ -237,7 +237,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMea
             fdw_server=plpy.quote_literal(server_name)))
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client._DST_ConnectUserTable(
     username text,
diff --git a/client/old_versions/cdb_dataservices_client--0.10.2.sql b/client/old_versions/cdb_dataservices_client--0.10.2.sql
index f003137..2368198 100644
--- a/client/old_versions/cdb_dataservices_client--0.10.2.sql
+++ b/client/old_versions/cdb_dataservices_client--0.10.2.sql
@@ -1282,7 +1282,7 @@ RETURNS boolean AS $$
                 .format(username=plpy.quote_nullable(username), orgname=plpy.quote_nullable(orgname), server_schema=plpy.quote_literal(server_schema), server_table_name=plpy.quote_literal(server_table_name), fdw_server=plpy.quote_literal(server_name))
                 )
         return False
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 
 
@@ -1357,7 +1357,7 @@ RETURNS boolean AS $$
                 .format(username=plpy.quote_nullable(username), orgname=plpy.quote_nullable(orgname), server_schema=plpy.quote_literal(server_schema), server_table_name=plpy.quote_literal(server_table_name), fdw_server=plpy.quote_literal(server_name))
                 )
         return False
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client._OBS_ConnectUserTable(username text, orgname text, user_db_role text, user_schema text, dbname text, table_name text)
diff --git a/client/old_versions/cdb_dataservices_client--0.11.0--0.10.2.sql b/client/old_versions/cdb_dataservices_client--0.11.0--0.10.2.sql
index 7bebfd9..034a513 100644
--- a/client/old_versions/cdb_dataservices_client--0.11.0--0.10.2.sql
+++ b/client/old_versions/cdb_dataservices_client--0.11.0--0.10.2.sql
@@ -175,7 +175,7 @@ RETURNS boolean AS $$
                 .format(username=plpy.quote_nullable(username), orgname=plpy.quote_nullable(orgname), server_schema=plpy.quote_literal(server_schema), server_table_name=plpy.quote_literal(server_table_name), fdw_server=plpy.quote_literal(server_name))
                 )
         return False
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 
 
@@ -250,7 +250,7 @@ RETURNS boolean AS $$
                 .format(username=plpy.quote_nullable(username), orgname=plpy.quote_nullable(orgname), server_schema=plpy.quote_literal(server_schema), server_table_name=plpy.quote_literal(server_table_name), fdw_server=plpy.quote_literal(server_name))
                 )
         return False
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client._OBS_ConnectUserTable(username text, orgname text, user_db_role text, user_schema text, dbname text, table_name text)
diff --git a/client/old_versions/cdb_dataservices_client--0.11.0--0.11.1.sql b/client/old_versions/cdb_dataservices_client--0.11.0--0.11.1.sql
index 0e60587..a4cea79 100644
--- a/client/old_versions/cdb_dataservices_client--0.11.0--0.11.1.sql
+++ b/client/old_versions/cdb_dataservices_client--0.11.0--0.11.1.sql
@@ -44,7 +44,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PrepareTableOBS_GetMeas
         )
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMeasure(
     username text,
@@ -137,4 +137,4 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMea
             fdw_server=plpy.quote_literal(server_name)))
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
diff --git a/client/old_versions/cdb_dataservices_client--0.11.0.sql b/client/old_versions/cdb_dataservices_client--0.11.0.sql
index 671069d..cf3aaaf 100644
--- a/client/old_versions/cdb_dataservices_client--0.11.0.sql
+++ b/client/old_versions/cdb_dataservices_client--0.11.0.sql
@@ -1251,7 +1251,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PrepareTableOBS_GetMeas
         )
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMeasure(
     username text,
@@ -1344,7 +1344,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMea
             fdw_server=plpy.quote_literal(server_name)))
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client._DST_ConnectUserTable(
     username text,
diff --git a/client/old_versions/cdb_dataservices_client--0.11.1--0.11.0.sql b/client/old_versions/cdb_dataservices_client--0.11.1--0.11.0.sql
index d44d30c..294db98 100644
--- a/client/old_versions/cdb_dataservices_client--0.11.1--0.11.0.sql
+++ b/client/old_versions/cdb_dataservices_client--0.11.1--0.11.0.sql
@@ -44,7 +44,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PrepareTableOBS_GetMeas
         )
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMeasure(
     username text,
@@ -137,4 +137,4 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMea
             fdw_server=plpy.quote_literal(server_name)))
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
diff --git a/client/old_versions/cdb_dataservices_client--0.11.1.sql b/client/old_versions/cdb_dataservices_client--0.11.1.sql
index 05b6b34..c8092ac 100644
--- a/client/old_versions/cdb_dataservices_client--0.11.1.sql
+++ b/client/old_versions/cdb_dataservices_client--0.11.1.sql
@@ -1251,7 +1251,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PrepareTableOBS_GetMeas
         )
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMeasure(
     username text,
@@ -1344,7 +1344,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMea
             fdw_server=plpy.quote_literal(server_name)))
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client._DST_ConnectUserTable(
     username text,
diff --git a/client/old_versions/cdb_dataservices_client--0.12.0.sql b/client/old_versions/cdb_dataservices_client--0.12.0.sql
index d0711cb..7ac7c5c 100644
--- a/client/old_versions/cdb_dataservices_client--0.12.0.sql
+++ b/client/old_versions/cdb_dataservices_client--0.12.0.sql
@@ -1396,7 +1396,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PrepareTableOBS_GetMeas
         )
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMeasure(
     username text,
@@ -1489,7 +1489,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMea
             fdw_server=plpy.quote_literal(server_name)))
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client._DST_ConnectUserTable(
     username text,
diff --git a/client/old_versions/cdb_dataservices_client--0.12.1.sql b/client/old_versions/cdb_dataservices_client--0.12.1.sql
index ee27ce0..ca1cdd3 100644
--- a/client/old_versions/cdb_dataservices_client--0.12.1.sql
+++ b/client/old_versions/cdb_dataservices_client--0.12.1.sql
@@ -1396,7 +1396,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PrepareTableOBS_GetMeas
         )
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMeasure(
     username text,
@@ -1489,7 +1489,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMea
             fdw_server=plpy.quote_literal(server_name)))
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client._DST_ConnectUserTable(
     username text,
diff --git a/client/old_versions/cdb_dataservices_client--0.13.0.sql b/client/old_versions/cdb_dataservices_client--0.13.0.sql
index 219bc19..1ebb774 100644
--- a/client/old_versions/cdb_dataservices_client--0.13.0.sql
+++ b/client/old_versions/cdb_dataservices_client--0.13.0.sql
@@ -1467,7 +1467,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PrepareTableOBS_GetMeas
         )
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMeasure(
     username text,
@@ -1560,7 +1560,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMea
             fdw_server=plpy.quote_literal(server_name)))
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client._DST_ConnectUserTable(
     username text,
diff --git a/client/old_versions/cdb_dataservices_client--0.14.0.sql b/client/old_versions/cdb_dataservices_client--0.14.0.sql
index 682a4f1..5cded17 100644
--- a/client/old_versions/cdb_dataservices_client--0.14.0.sql
+++ b/client/old_versions/cdb_dataservices_client--0.14.0.sql
@@ -1467,7 +1467,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PrepareTableOBS_GetMeas
         )
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMeasure(
     username text,
@@ -1560,7 +1560,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMea
             fdw_server=plpy.quote_literal(server_name)))
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client._DST_ConnectUserTable(
     username text,
diff --git a/client/old_versions/cdb_dataservices_client--0.14.1.sql b/client/old_versions/cdb_dataservices_client--0.14.1.sql
index df980e3..2f9ee84 100644
--- a/client/old_versions/cdb_dataservices_client--0.14.1.sql
+++ b/client/old_versions/cdb_dataservices_client--0.14.1.sql
@@ -1470,7 +1470,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PrepareTableOBS_GetMeas
         )
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMeasure(
     username text,
@@ -1563,7 +1563,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMea
             fdw_server=plpy.quote_literal(server_name)))
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client._DST_ConnectUserTable(
     username text,
diff --git a/client/old_versions/cdb_dataservices_client--0.15.0.sql b/client/old_versions/cdb_dataservices_client--0.15.0.sql
index 66c3621..0f9e647 100644
--- a/client/old_versions/cdb_dataservices_client--0.15.0.sql
+++ b/client/old_versions/cdb_dataservices_client--0.15.0.sql
@@ -1551,7 +1551,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PrepareTableOBS_GetMeas
         )
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMeasure(
     username text,
@@ -1644,7 +1644,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMea
             fdw_server=plpy.quote_literal(server_name)))
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client._DST_ConnectUserTable(
     username text,
diff --git a/client/old_versions/cdb_dataservices_client--0.16.0.sql b/client/old_versions/cdb_dataservices_client--0.16.0.sql
index 248c0cd..40dfbbc 100644
--- a/client/old_versions/cdb_dataservices_client--0.16.0.sql
+++ b/client/old_versions/cdb_dataservices_client--0.16.0.sql
@@ -1550,7 +1550,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PrepareTableOBS_GetMeas
         )
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMeasure(
     username text,
@@ -1643,7 +1643,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMea
             fdw_server=plpy.quote_literal(server_name)))
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client._DST_ConnectUserTable(
     username text,
diff --git a/client/old_versions/cdb_dataservices_client--0.17.0.sql b/client/old_versions/cdb_dataservices_client--0.17.0.sql
index 124aaef..eb73a15 100644
--- a/client/old_versions/cdb_dataservices_client--0.17.0.sql
+++ b/client/old_versions/cdb_dataservices_client--0.17.0.sql
@@ -1550,7 +1550,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PrepareTableOBS_GetMeas
         )
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMeasure(
     username text,
@@ -1643,7 +1643,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMea
             fdw_server=plpy.quote_literal(server_name)))
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client._DST_ConnectUserTable(
     username text,
diff --git a/client/old_versions/cdb_dataservices_client--0.18.0.sql b/client/old_versions/cdb_dataservices_client--0.18.0.sql
index a4a2574..9b79ac8 100644
--- a/client/old_versions/cdb_dataservices_client--0.18.0.sql
+++ b/client/old_versions/cdb_dataservices_client--0.18.0.sql
@@ -1600,7 +1600,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PrepareTableOBS_GetMeas
         )
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMeasure(
     username text,
@@ -1693,7 +1693,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMea
             fdw_server=plpy.quote_literal(server_name)))
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client._DST_ConnectUserTable(
     username text,
diff --git a/client/old_versions/cdb_dataservices_client--0.19.0.sql b/client/old_versions/cdb_dataservices_client--0.19.0.sql
index 93865fe..453b329 100644
--- a/client/old_versions/cdb_dataservices_client--0.19.0.sql
+++ b/client/old_versions/cdb_dataservices_client--0.19.0.sql
@@ -1625,7 +1625,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PrepareTableOBS_GetMeas
         )
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMeasure(
     username text,
@@ -1718,7 +1718,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMea
             fdw_server=plpy.quote_literal(server_name)))
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client._DST_ConnectUserTable(
     username text,
diff --git a/client/old_versions/cdb_dataservices_client--0.20.0.sql b/client/old_versions/cdb_dataservices_client--0.20.0.sql
index c968a53..2b35cad 100644
--- a/client/old_versions/cdb_dataservices_client--0.20.0.sql
+++ b/client/old_versions/cdb_dataservices_client--0.20.0.sql
@@ -1650,7 +1650,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PrepareTableOBS_GetMeas
         )
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMeasure(
     username text,
@@ -1743,7 +1743,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMea
             fdw_server=plpy.quote_literal(server_name)))
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client._DST_ConnectUserTable(
     username text,
diff --git a/client/old_versions/cdb_dataservices_client--0.21.0.sql b/client/old_versions/cdb_dataservices_client--0.21.0.sql
index b6bdb9f..2d70aa3 100644
--- a/client/old_versions/cdb_dataservices_client--0.21.0.sql
+++ b/client/old_versions/cdb_dataservices_client--0.21.0.sql
@@ -1650,7 +1650,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PrepareTableOBS_GetMeas
         )
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMeasure(
     username text,
@@ -1743,7 +1743,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMea
             fdw_server=plpy.quote_literal(server_name)))
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client._DST_ConnectUserTable(
     username text,
diff --git a/client/old_versions/cdb_dataservices_client--0.22.0--0.21.0.sql b/client/old_versions/cdb_dataservices_client--0.22.0--0.21.0.sql
index 51d5949..479bd19 100644
--- a/client/old_versions/cdb_dataservices_client--0.22.0--0.21.0.sql
+++ b/client/old_versions/cdb_dataservices_client--0.22.0--0.21.0.sql
@@ -1610,7 +1610,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PrepareTableOBS_GetMeas
         )
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMeasure(
     username text,
@@ -1703,7 +1703,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMea
             fdw_server=plpy.quote_literal(server_name)))
 
     return True
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client._DST_ConnectUserTable(
     username text,
diff --git a/client/old_versions/cdb_dataservices_client--0.9.0--0.10.0.sql b/client/old_versions/cdb_dataservices_client--0.9.0--0.10.0.sql
index 35b03d8..94cc398 100644
--- a/client/old_versions/cdb_dataservices_client--0.9.0--0.10.0.sql
+++ b/client/old_versions/cdb_dataservices_client--0.9.0--0.10.0.sql
@@ -164,7 +164,7 @@ RETURNS boolean AS $$
                 .format(username=plpy.quote_nullable(username), orgname=plpy.quote_nullable(orgname), server_schema=plpy.quote_literal(server_schema), server_table_name=plpy.quote_literal(server_table_name), fdw_server=plpy.quote_literal(server_name))
                 )
         return False
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 
 
@@ -239,7 +239,7 @@ RETURNS boolean AS $$
                 .format(username=plpy.quote_nullable(username), orgname=plpy.quote_nullable(orgname), server_schema=plpy.quote_literal(server_schema), server_table_name=plpy.quote_literal(server_table_name), fdw_server=plpy.quote_literal(server_name))
                 )
         return False
-$$ LANGUAGE plpythonu;
+$$ LANGUAGE @@plpythonu@@;
 
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client._OBS_ConnectUserTable(username text, orgname text, user_db_role text, user_schema text, dbname text, table_name text)