diff --git a/CISTOOLS/Functions/GET_XA_DOMAIN_CLASS_INFO.sql b/CISTOOLS/Functions/GET_XA_DOMAIN_CLASS_INFO.sql
index 6e72164..0ada686 100644
--- a/CISTOOLS/Functions/GET_XA_DOMAIN_CLASS_INFO.sql
+++ b/CISTOOLS/Functions/GET_XA_DOMAIN_CLASS_INFO.sql
@@ -1 +1,223 @@
-âÅã@×ÁãÈ@\ÓÉÂÓ@^@
%
%ÃÙÅÁãÅ@ÖÙ@ÙÅ×ÓÁÃÅ@ÆäÕÃãÉÖÕ@ÃÉâãÖÖÓâKÇÅãmçÁmÄÖÔÁÉÕmÃÓÁââmÉÕÆÖ@M@
%ÖÂÑÅÃãmÃÓÁââ@åÁÙÃÈÁÙMòõö]@]@
%ÙÅãäÙÕâ@ãÁÂÓÅ@M@
%ÆÉÅÓÄmÕÁÔÅ@åÁÙÃÈÁÙMñòø]@k@
%ÄÅâÃÙÉ×ãÉÖÕ@åÁÙÃÈÁÙMñòø]@k@
%ÆÉÅÓÄmãè×Å@åÁÙÃÈÁÙMòð]@k@
%ÆÉÅÓÄmÓÅÕÇãÈ@ÄÅÃÆÓÖÁãMñö]@k@
%äâÅmÉÕmÃÙÅÁãÅ@åÁÙÃÈÁÙMñð]@k@
%äâÅmÉÕmÔÁÉÕãÁÉÕ@åÁÙÃÈÁÙMñð]@k@
%ÕäÓÓÁÂÓÅ@åÁÙÃÈÁÙMñð]@k@
%ÒÅèm×ÖâÉãÉÖÕ@åÁÙÃÈÁÙMñð]@k@
%ÁÃãÉÖÕâmçÔÓ@çÔÓ@k@
%ãÉãÓÅmçÔÓ@çÔÓ@k@
%Ö×ãÉÖÕâmçÔÓ@çÔÓ@k@
%ÙÅÓÁãÉÖÕâÈÉ×mçÔÓ@çÔÓ@k@
%ãÅçãmÉÕÆÖmçÔÓ@çÔÓ@k@
%ÅçãÅÕÄÅÄm×ÙÖ×ÅÙãÉÅâmçÔÓ@çÔÓ@]@@@
%ÓÁÕÇäÁÇÅ@âØÓ@
%â×ÅÃÉÆÉÃ@ÃÉâãÖÖÓâKÇÅãmçÁmÄÖÔÁÉÕmÃÓÁââmÉÕÆÖ@
%ÕÖã@ÄÅãÅÙÔÉÕÉâãÉÃ@
%ÙÅÁÄâ@âØÓ@ÄÁãÁ@
%ÃÁÓÓÅÄ@ÖÕ@ÕäÓÓ@ÉÕ×äã@
%âÅã@Ö×ãÉÖÕ@@ÁÓæÂÓÒ@~@\ÁÓÓÙÅÁÄ@k@
%ÁÓæÃ×èÄãÁ@~@\Ö×ãÉÔÉéÅ@k@
%ÃÖÔÔÉã@~@\ÕÖÕÅ@k@
%ÄÅÃÙÅâäÓã@~@Móñk@óñk@ðð]@k@
%ÄèÕÄÆãÃÖÓ@~@\ÕÖ@k@
%ÄèÕäâÙ×ÙÆ@~@\ÖæÕÅÙ@k@
%âÙãâÅØ@~@\ÈÅç@@@
%ÂÅÇÉÕ@
%ÄÅÃÓÁÙÅ@âÓmÙÅâ×@çÔÓ@^@
%``@Â¤‰“„@â¨¢£…”Ó‰•’@™…˜¤…¢£^@
%âÅã@âÓmÙÅØ@~@âãÙÉ×mâ×ÁÃÅâ@M@}Lo§”“@¥…™¢‰–•~}}ñKð}}@on%LZÄÖÃãè×Å@â¨¢£…”`Ó‰•’@âèâãÅÔ@}}â¨¢£…”Ó‰•’Ù…˜¤…¢£K„£„}}n%Lâ¨¢£…”`Ó‰•’n%@@LÓ–‡‰•@¤¢…™É„~}}Pl¤¢…™•�”…lP}}@—�¢¢¦–™„~}}Pl—�¢¢¦–™„lP}}@”�§É„“…~}}öðð}}%@@@@@@@@@—™–—…™£‰…¢~}}ƒ–”K”�—‰ƒ¢Kƒ�¢K„–”�‰•KÅ•¥‰™–•”…•£É„~Pl…•¥lPk%@@@@@@@@@@@@@@@@@@@@@@ƒ–”K”�—‰ƒ¢Kƒ�¢K„–”�‰•Kâ¨¢£…”Õ�”…~Plˆ–¢£•�”…lPk%@@@@@@@@@@@@@@@@@@@@@@ƒ–”K”�—‰ƒ¢Kƒ�¢K¤¢…™KÓ�•‡¤�‡…É„~…•}}an%@@LÙ…˜¤…¢£@¢…¢¢‰–•È�•„“…~}}\ƒ¤™™…•£}}@¦–™’È�•„“…~}}\•…¦}}%@@@@@@@@@@@‚™–’…™~}}ÅÑÂ}}@”�§É„“…~}}öðð}}n%@@@@@@LÓ‰¢£Ä–”�‰•Ã“�¢¢É•†–@•�”…~}}Ç…£Æ‰…“„¢mñ}}@ƒ“�¢¢Ô•…”–•‰ƒ~}}Pl„–”�‰•ƒ“�¢¢lP}}@„‰¢—“�¨×™–—…™£‰…¢~}}’…¨â…—�™�£…„}}%@@@@@@@@@@@¢ˆ–¦Áƒ£‰–•¢~}}£™¤…}}@¢ˆ–¦ã‰£“…¢~}}£™¤…}}@¢ˆ–¦Ö—£‰–•¢~}}£™¤…}}%@@@@@@@@@@@¢ˆ–¦Ù…“�£‰–•¢ˆ‰—¢~}}£™¤…}}@¢ˆ–¦ã…§£É•†–~}}£™¤…}}@¢ˆ–¦Å§£…•„…„×™–—…™£¨É•†–~}}£™¤…}}@an%@@LaÙ…˜¤…¢£n%@@LÓ–‡–¤£@¢…¢¢‰–•È�•„“…~}}\ƒ¤™™…•£}}an%Laâ¨¢£…”`Ó‰•’n}@]@^@
%``@äÙÓ@…•ƒ–„…@£ˆ…@™…˜¤…¢£@
%âÅã@âÓmÙÅØ@~@âÓmäÙÓ@OO@}â¨¢£…”Ó‰•’Ù…˜¤…¢£~}@OO@äÙÓmÅÕÃÖÄÅ@M@âÓmÙÅØ@]@^@
%âÅã@âÓmÙÅØ@~@âÓmÙÅØ@OO@}P¤¢…™•�”…~}@OO@
%äÙÓmÅÕÃÖÄÅ@M@ãÙÉÔ@M@âäÂâãÙ@M@âÓmÃÙÅÄâ@k@ñ@k@ñð@]@]@]@^@
%âÅã@âÓmÙÅØ@~@âÓmÙÅØ@OO@}P—�¢¢¦–™„~}@OO@
%äÙÓmÅÕÃÖÄÅ@M@ãÙÉÔ@M@âäÂâãÙ@M@âÓmÃÙÅÄâ@k@ññ@k@ñð@]@]@]@^@
%âÅã@âÓmÙÅØ@~@âÓmÙÅØ@OO@}P…•¥~}@OO@äÙÓmÅÕÃÖÄÅ@M@ÔÁ×ÉÃâmÅÕå@]@^@
%âÅã@âÓmÙÅØ@~@âÓmÙÅØ@OO@}Pˆ–¢£•�”…~}@OO@äÙÓmÅÕÃÖÄÅ@M@ãÙÉÔ@M@ÈÖâãmÕÁÔÅ@]@]@^@
%âÅã@âÓmÙÅØ@~@âÓmÙÅØ@OO@}P„–”�‰•ƒ“�¢¢~}@OO@äÙÓmÅÕÃÖÄÅ@M@ÖÂÑÅÃãmÃÓÁââ@]@^@
%``@Ã�““@â¨¢£…”Ó‰•’@
%âÅã@âÓmÙÅâ×@~@çÔÓ×ÁÙâÅ@M@ÄÖÃäÔÅÕã@Øâèâò@K@Èãã×mÇÅã@M@âÓmÙÅØ@]@]@^@
%ÙÅãäÙÕ@
%M@
%âÅÓÅÃã@Ò@K@ÆÉÅÓÄmÕÁÔÅ@k@Ò@K@ÄÅâÃÙÉ×ãÉÖÕ@k@Ò@K@ÆÉÅÓÄmãè×Å@k@
%Ò@K@ÆÉÅÓÄmÓÅÕÇãÈ@k@Ò@K@äâÅmÉÕmÃÙÅÁãÅ@k@
%Ò@K@äâÅmÉÕmä×ÄÁãÅ@Áâ@äâÅmÉÕmÔÁÉÕãÁÉÕ@k@Ò@K@ÕäÓÓÁÂÓÅ@k@
%ÃÁâã@M@ÙÖæmÕäÔÂÅÙ@M@]@ÖåÅÙ@M@
%]@Áâ@åÁÙÃÈÁÙ@M@ñð@]@]@Áâ@ÒÅèm×ÖâÉãÉÖÕ@k@
%``@Á££�ƒˆ@†¤““@çÔÓ@‚“–ƒ’¢@
%M@
%âÅÓÅÃã@\@
%ÆÙÖÔ@ãÁÂÓÅ@M@
%âÅÓÅÃã@ç@
%ÆÙÖÔ@çÔÓãÁÂÓÅ@M@
%}[„–ƒaâ¨¢£…”`Ó‰•’aÙ…¢—–•¢…aÓ‰¢£Ä–”�‰•Ã“�¢¢É•†–Ù…¢—–•¢…aÄ–”
\ No newline at end of file
+SET PATH *LIBL ; 
+
+CREATE OR REPLACE FUNCTION CISTOOLS.GET_XA_DOMAIN_CLASS_INFO ( 
+	OBJECT_CLASS VARCHAR(256) ) 
+	RETURNS TABLE ( 
+	FIELD_NAME VARCHAR(128) , 
+	DESCRIPTION VARCHAR(128) , 
+	FIELD_TYPE VARCHAR(20) , 
+	FIELD_LENGTH DECFLOAT(16) , 
+	USE_IN_CREATE VARCHAR(10) , 
+	USE_IN_MAINTAIN VARCHAR(10) , 
+	NULLABLE VARCHAR(10) , 
+	KEY_POSITION VARCHAR(10) , 
+	ACTIONS_XML XML , 
+	TITLE_XML XML , 
+	OPTIONS_XML XML , 
+	RELATIONSHIP_XML XML , 
+	TEXT_INFO_XML XML , 
+	EXTENDED_PROPERTIES_XML XML )   
+	LANGUAGE SQL 
+	SPECIFIC CISTOOLS.GET_XA_DOMAIN_CLASS_INFO 
+	NOT DETERMINISTIC 
+	READS SQL DATA 
+	CALLED ON NULL INPUT 
+	SET OPTION  ALWBLK = *ALLREAD , 
+	ALWCPYDTA = *OPTIMIZE , 
+	COMMIT = *NONE , 
+	DECRESULT = (31, 31, 00) , 
+	DYNDFTCOL = *NO , 
+	DYNUSRPRF = *OWNER , 
+	SRTSEQ = *HEX   
+	BEGIN 
+DECLARE SL_RESP XML ; 
+-- Build SystemLink request; 
+SET SL_REQ = STRIP_SPACES ( '<?xml version=''1.0'' ?>
+<!DOCTYPE System-Link SYSTEM ''SystemLinkRequest.dtd''>
+<System-Link>
+  <Login userId=''&%username%&'' password=''&%password%&'' maxIdle=''600''
+         properties=''com.mapics.cas.domain.EnvironmentId=&%env%&,
+                      com.mapics.cas.domain.SystemName=&%hostname%&,
+                      com.mapics.cas.user.LanguageId=en''/>
+  <Request sessionHandle=''*current'' workHandle=''*new''
+           broker=''EJB'' maxIdle=''600''>
+      <ListDomainClassInfo name=''GetFields_1'' classMnemonic=''&%domainclass%&'' displayProperties=''keySeparated''
+           showActions=''true'' showTitles=''true'' showOptions=''true''
+           showRelationships=''true'' showTextInfo=''true'' showExtendedPropertyInfo=''true'' />
+  </Request>
+  <Logout sessionHandle=''*current''/>
+</System-Link>' ) ; 
+-- URL encode the request 
+SET SL_REQ = SL_URL || 'SystemLinkRequest=' || URL_ENCODE ( SL_REQ ) ; 
+SET SL_REQ = SL_REQ || '&username=' || 
+URL_ENCODE ( TRIM ( SUBSTR ( SL_CREDS , 1 , 10 ) ) ) ; 
+SET SL_REQ = SL_REQ || '&password=' || 
+URL_ENCODE ( TRIM ( SUBSTR ( SL_CREDS , 11 , 10 ) ) ) ; 
+SET SL_REQ = SL_REQ || '&env=' || URL_ENCODE ( MAPICS_ENV ) ; 
+SET SL_REQ = SL_REQ || '&hostname=' || URL_ENCODE ( TRIM ( HOST_NAME ) ) ; 
+SET SL_REQ = SL_REQ || '&domainclass=' || URL_ENCODE ( OBJECT_CLASS ) ; 
+-- Call SystemLink 
+SET SL_RESP = XMLPARSE ( DOCUMENT QSYS2 . HTTP_GET ( SL_REQ ) ) ; 
+RETURN 
+( 
+SELECT K . FIELD_NAME , K . DESCRIPTION , K . FIELD_TYPE , 
+K . FIELD_LENGTH , K . USE_IN_CREATE , 
+K . USE_IN_UPDATE AS USE_IN_MAINTAIN , K . NULLABLE , 
+CAST ( ROW_NUMBER ( ) OVER ( 
+) AS VARCHAR ( 10 ) ) AS KEY_POSITION , 
+-- Attach full XML blocks 
+( 
+SELECT * 
+FROM TABLE ( 
+SELECT X 
+FROM XMLTABLE ( 
+'$doc/System-Link/Response/ListDomainClassInfoResponse/DomainClassInfo/ActionsAllowed' 
+PASSING D . XMLDOC AS "doc" COLUMNS X XML PATH '.' ) 
+) 
+LIMIT 1 ) AS ACTIONS_XML , 
+( 
+SELECT * 
+FROM TABLE ( 
+SELECT X 
+FROM XMLTABLE ( 
+'$doc/System-Link/Response/ListDomainClassInfoResponse/DomainClassInfo/FormTitle' 
+PASSING D . XMLDOC AS "doc" COLUMNS X XML PATH '.' ) 
+) 
+LIMIT 1 ) AS TITLE_XML , 
+( 
+SELECT * 
+FROM TABLE ( 
+SELECT X 
+FROM XMLTABLE ( 
+'$doc/System-Link/Response/ListDomainClassInfoResponse/DomainClassInfo/CopyOptionInfo' 
+PASSING D . XMLDOC AS "doc" COLUMNS X XML PATH '.' ) 
+) 
+LIMIT 1 ) AS OPTIONS_XML , 
+( 
+SELECT * 
+FROM TABLE ( 
+SELECT X 
+FROM XMLTABLE ( 
+'$doc/System-Link/Response/ListDomainClassInfoResponse/DomainClassInfo/RelationshipInfo' 
+PASSING D . XMLDOC AS "doc" COLUMNS X XML PATH '.' ) 
+) 
+LIMIT 1 ) AS RELATIONSHIP_XML , 
+( 
+SELECT * 
+FROM TABLE ( 
+SELECT X 
+FROM XMLTABLE ( 
+'$doc/System-Link/Response/ListDomainClassInfoResponse/DomainClassInfo/TextRelationshipInfo' 
+PASSING D . XMLDOC AS "doc" COLUMNS X XML PATH '.' ) 
+) 
+LIMIT 1 ) AS TEXT_INFO_XML , 
+( 
+SELECT * 
+FROM TABLE ( 
+SELECT X 
+FROM XMLTABLE ( 
+'$doc/System-Link/Response/ListDomainClassInfoResponse/DomainClassInfo/PropertyExtendedInfo' 
+PASSING D . XMLDOC AS "doc" COLUMNS X XML PATH '.' ) 
+) 
+LIMIT 1 ) AS EXTENDED_PROPERTIES_XML 
+FROM ( 
+VALUES SL_RESP 
+) AS D ( XMLDOC ) 
+LEFT JOIN 
+XMLTABLE ( 
+'$doc/System-Link/Response/ListDomainClassInfoResponse/DomainClassInfo/KeyInfo/PropertyInfo' 
+PASSING D . XMLDOC AS "doc" COLUMNS FIELD_NAME VARCHAR ( 128 ) 
+PATH '@path' , DESCRIPTION VARCHAR ( 128 ) PATH 'text()' , 
+FIELD_TYPE VARCHAR ( 20 ) PATH '@format' , FIELD_LENGTH DECFLOAT ( 
+16 ) PATH '@length' , USE_IN_CREATE VARCHAR ( 10 ) PATH 
+'@canCreate' , USE_IN_UPDATE VARCHAR ( 10 ) PATH '@canUpdate' , 
+NULLABLE VARCHAR ( 10 ) PATH '@isNullAllowed' ) AS K 
+ON 1 = 1 
+UNION ALL 
+SELECT P . FIELD_NAME , P . DESCRIPTION , P . FIELD_TYPE , 
+P . FIELD_LENGTH , P . USE_IN_CREATE , 
+P . USE_IN_UPDATE AS USE_IN_MAINTAIN , P . NULLABLE , 
+CAST ( NULL AS VARCHAR ( 10 ) ) AS KEY_POSITION , 
+( 
+SELECT * 
+FROM TABLE ( 
+SELECT X 
+FROM XMLTABLE ( 
+'$doc/System-Link/Response/ListDomainClassInfoResponse/DomainClassInfo/ActionsAllowed' 
+PASSING D . XMLDOC AS "doc" COLUMNS X XML PATH '.' ) 
+) 
+LIMIT 1 ) AS ACTIONS_XML , 
+( 
+SELECT * 
+FROM TABLE ( 
+SELECT X 
+FROM XMLTABLE ( 
+'$doc/System-Link/Response/ListDomainClassInfoResponse/DomainClassInfo/FormTitle' 
+PASSING D . XMLDOC AS "doc" COLUMNS X XML PATH '.' ) 
+) 
+LIMIT 1 ) AS TITLE_XML , 
+( 
+SELECT * 
+FROM TABLE ( 
+SELECT X 
+FROM XMLTABLE ( 
+'$doc/System-Link/Response/ListDomainClassInfoResponse/DomainClassInfo/CopyOptionInfo' 
+PASSING D . XMLDOC AS "doc" COLUMNS X XML PATH '.' ) 
+) 
+LIMIT 1 ) AS OPTIONS_XML , 
+( 
+SELECT * 
+FROM TABLE ( 
+SELECT X 
+FROM XMLTABLE ( 
+'$doc/System-Link/Response/ListDomainClassInfoResponse/DomainClassInfo/RelationshipInfo' 
+PASSING D . XMLDOC AS "doc" COLUMNS X XML PATH '.' ) 
+) 
+LIMIT 1 ) AS RELATIONSHIP_XML , 
+( 
+SELECT * 
+FROM TABLE ( 
+SELECT X 
+FROM XMLTABLE ( 
+'$doc/System-Link/Response/ListDomainClassInfoResponse/DomainClassInfo/TextRelationshipInfo' 
+PASSING D . XMLDOC AS "doc" COLUMNS X XML PATH '.' ) 
+) 
+LIMIT 1 ) AS TEXT_INFO_XML , 
+( 
+SELECT * 
+FROM TABLE ( 
+SELECT X 
+FROM XMLTABLE ( 
+'$doc/System-Link/Response/ListDomainClassInfoResponse/DomainClassInfo/PropertyExtendedInfo' 
+PASSING D . XMLDOC AS "doc" COLUMNS X XML PATH '.' ) 
+) 
+LIMIT 1 ) AS EXTENDED_PROPERTIES_XML 
+FROM ( 
+VALUES SL_RESP 
+) AS D ( XMLDOC ) 
+LEFT JOIN 
+XMLTABLE ( 
+'$doc/System-Link/Response/ListDomainClassInfoResponse/DomainClassInfo/PropertyInfo' 
+PASSING D . XMLDOC AS "doc" COLUMNS FIELD_NAME VARCHAR ( 128 ) 
+PATH '@path' , DESCRIPTION VARCHAR ( 128 ) PATH 'text()' , 
+FIELD_TYPE VARCHAR ( 20 ) PATH '@format' , FIELD_LENGTH DECFLOAT ( 
+16 ) PATH '@length' , USE_IN_CREATE VARCHAR ( 10 ) PATH 
+'@canCreate' , USE_IN_UPDATE VARCHAR ( 10 ) PATH '@canUpdate' , 
+NULLABLE VARCHAR ( 10 ) PATH '@isNullAllowed' ) AS P 
+ON 1 = 1 ) ; 
+END  ; 
+
+COMMENT ON PARAMETER SPECIFIC FUNCTION CISTOOLS.GET_XA_DOMAIN_CLASS_INFO 
+( OBJECT_CLASS IS 'Object Class' ) ; 
+
+LABEL ON SPECIFIC FUNCTION CISTOOLS.GET_XA_DOMAIN_CLASS_INFO 
+	IS 'Get Xa Domain Class Info' ; 
+
+GRANT ALTER , EXECUTE   
+ON SPECIFIC FUNCTION CISTOOLS.GET_XA_DOMAIN_CLASS_INFO 
+TO AMAPICS WITH GRANT OPTION ; 
+
+GRANT EXECUTE   
+ON SPECIFIC FUNCTION CISTOOLS.GET_XA_DOMAIN_CLASS_INFO 
+TO PUBLIC ; 
+
