diff --git a/examples/EntryToken/EntryToken.xml b/examples/EntryToken/EntryToken.xml
index 90687323..c3730074 100644
--- a/examples/EntryToken/EntryToken.xml
+++ b/examples/EntryToken/EntryToken.xml
@@ -5,10 +5,10 @@
     <!ENTITY icon.en SYSTEM "icon.en.shtml">
     <!ENTITY style SYSTEM "shared.css">
 ]>
-<ts:token xmlns:ts="http://tokenscript.org/2019/05/tokenscript"
+<ts:token xmlns:ts="http://tokenscript.org/2019/10/tokenscript"
           xmlns="http://www.w3.org/1999/xhtml"
           xmlns:xml="http://www.w3.org/XML/1998/namespace"
-          xsi:schemaLocation="http://tokenscript.org/2019/05/tokenscript"
+          xsi:schemaLocation="http://tokenscript.org/2019/10/tokenscript http://tokenscript.org/2019/10/tokenscript.xsd"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           custodian="false"
 >
diff --git a/examples/EntryToken/Makefile b/examples/EntryToken/Makefile
index 78317f0b..272ed537 100644
--- a/examples/EntryToken/Makefile
+++ b/examples/EntryToken/Makefile
@@ -23,7 +23,7 @@ help:
 	# XML Validation
     # if INVALID, run validation again with xmllint to get meaningful error
     # then delete the canonicalized file
-	-xmlstarlet val --xsd http://tokenscript.org/2019/05/tokenscript/tokenscript.xsd $@ || (mv $@ $@.INVALID; xmllint --noout --schema http://tokenscript.org/2019/05/tokenscript/tokenscript.xsd $@.INVALID)
+	-xmlstarlet val --xsd http://tokenscript.org/2019/10/tokenscript/tokenscript.xsd $@ || (mv $@ $@.INVALID; xmllint --noout --schema http://tokenscript.org/2019/10/tokenscript/tokenscript.xsd $@.INVALID)
 
 %.tsml: %.canonicalized.xml
 ifeq (,$(KEYSTORE))
diff --git a/examples/action/Makefile b/examples/action/Makefile
index 5cc1c2e3..6e793d50 100644
--- a/examples/action/Makefile
+++ b/examples/action/Makefile
@@ -23,7 +23,7 @@ help:
 	# XML Validation
     # if INVALID, run validation again with xmllint to get meaningful error
     # then delete the canonicalized file
-	-xmlstarlet val --xsd http://tokenscript.org/2019/05/tokenscript/tokenscript.xsd $@ || (mv $@ $@.INVALID; xmllint --noout --schema http://tokenscript.org/2019/05/tokenscript/tokenscript.xsd $@.INVALID)
+	-xmlstarlet val --xsd http://tokenscript.org/2019/10/tokenscript/tokenscript.xsd $@ || (mv $@ $@.INVALID; xmllint --noout --schema http://tokenscript.org/2019/10/tokenscript/tokenscript.xsd $@.INVALID)
 
 %.tsml: %.canonicalized.xml
 ifeq (,$(KEYSTORE))
diff --git a/examples/action/XDAI-bridge.xml b/examples/action/XDAI-bridge.xml
index 37a3e9b9..f2c162c7 100644
--- a/examples/action/XDAI-bridge.xml
+++ b/examples/action/XDAI-bridge.xml
@@ -3,7 +3,7 @@
         <!ENTITY style SYSTEM "shared.css">
         <!ENTITY xdai-bridge.en SYSTEM "xdai-bridge.en.shtml">
 ]>
-<ts:action xmlns:ts="http://tokenscript.org/2019/05/tokenscript"
+<ts:action xmlns:ts="http://tokenscript.org/2019/10/tokenscript"
            xmlns="http://www.w3.org/1999/xhtml"
            xmlns:xml="http://www.w3.org/XML/1998/namespace"
 >
diff --git a/examples/devcon5-nft/Devcon.xml b/examples/devcon5-nft/Devcon.xml
index 0a2fdc19..574f5818 100644
--- a/examples/devcon5-nft/Devcon.xml
+++ b/examples/devcon5-nft/Devcon.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<ts:token xmlns:ts="http://tokenscript.org/2019/05/tokenscript"
+<ts:token xmlns:ts="http://tokenscript.org/2019/10/tokenscript"
           xmlns="http://www.w3.org/1999/xhtml"
           xmlns:xml="http://www.w3.org/XML/1998/namespace"
-          xsi:schemaLocation="http://tokenscript.org/2019/05/tokenscript"
+          xsi:schemaLocation="http://tokenscript.org/2019/10/tokenscript http://tokenscript.org/2019/10/tokenscript.xsd"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           custodian="false"
 >
diff --git a/examples/devcon5-nft/Makefile b/examples/devcon5-nft/Makefile
index 78317f0b..272ed537 100644
--- a/examples/devcon5-nft/Makefile
+++ b/examples/devcon5-nft/Makefile
@@ -23,7 +23,7 @@ help:
 	# XML Validation
     # if INVALID, run validation again with xmllint to get meaningful error
     # then delete the canonicalized file
-	-xmlstarlet val --xsd http://tokenscript.org/2019/05/tokenscript/tokenscript.xsd $@ || (mv $@ $@.INVALID; xmllint --noout --schema http://tokenscript.org/2019/05/tokenscript/tokenscript.xsd $@.INVALID)
+	-xmlstarlet val --xsd http://tokenscript.org/2019/10/tokenscript/tokenscript.xsd $@ || (mv $@ $@.INVALID; xmllint --noout --schema http://tokenscript.org/2019/10/tokenscript/tokenscript.xsd $@.INVALID)
 
 %.tsml: %.canonicalized.xml
 ifeq (,$(KEYSTORE))
diff --git a/examples/erc20/AlphaWallet-Discovery-Token/ALP.xml b/examples/erc20/AlphaWallet-Discovery-Token/ALP.xml
index 08f82d52..c30efca6 100644
--- a/examples/erc20/AlphaWallet-Discovery-Token/ALP.xml
+++ b/examples/erc20/AlphaWallet-Discovery-Token/ALP.xml
@@ -3,10 +3,10 @@
         <!ENTITY style SYSTEM "shared.css">
         <!ENTITY discover.en SYSTEM "discover.en.shtml">
         ]>
-<ts:token xmlns:ts="http://tokenscript.org/2019/05/tokenscript"
+<ts:token xmlns:ts="http://tokenscript.org/2019/10/tokenscript"
           xmlns="http://www.w3.org/1999/xhtml"
           xmlns:xml="http://www.w3.org/XML/1998/namespace"
-          xsi:schemaLocation="http://tokenscript.org/2019/05/tokenscript"
+          xsi:schemaLocation="http://tokenscript.org/2019/10/tokenscript http://tokenscript.org/2019/10/tokenscript.xsd"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           custodian="false"
 >
diff --git a/examples/erc20/AlphaWallet-Discovery-Token/Makefile b/examples/erc20/AlphaWallet-Discovery-Token/Makefile
index 5cc1c2e3..6e793d50 100644
--- a/examples/erc20/AlphaWallet-Discovery-Token/Makefile
+++ b/examples/erc20/AlphaWallet-Discovery-Token/Makefile
@@ -23,7 +23,7 @@ help:
 	# XML Validation
     # if INVALID, run validation again with xmllint to get meaningful error
     # then delete the canonicalized file
-	-xmlstarlet val --xsd http://tokenscript.org/2019/05/tokenscript/tokenscript.xsd $@ || (mv $@ $@.INVALID; xmllint --noout --schema http://tokenscript.org/2019/05/tokenscript/tokenscript.xsd $@.INVALID)
+	-xmlstarlet val --xsd http://tokenscript.org/2019/10/tokenscript/tokenscript.xsd $@ || (mv $@ $@.INVALID; xmllint --noout --schema http://tokenscript.org/2019/10/tokenscript/tokenscript.xsd $@.INVALID)
 
 %.tsml: %.canonicalized.xml
 ifeq (,$(KEYSTORE))
diff --git a/examples/erc20/AlphaWallet-Discovery-Token/discover.en.shtml b/examples/erc20/AlphaWallet-Discovery-Token/discover.en.shtml
index 87f49dd8..231b9c17 100644
--- a/examples/erc20/AlphaWallet-Discovery-Token/discover.en.shtml
+++ b/examples/erc20/AlphaWallet-Discovery-Token/discover.en.shtml
@@ -1,3 +1,4 @@
+<script src="https://www.google.com/recaptcha/api.js" type="text/javascript"></script>
 <script type="text/javascript"><![CDATA[
 class Token {
 
@@ -6,6 +7,10 @@ class Token {
         this.getStatus();
         this.setOnConfirm();
         this.props.claimed = false;
+        this.props.claimTokensMessage = "Claim free DAI, DeFi & ETH tokens";
+        this.props.claimedMessage = "You have already claimed DAI, DeFi & ETH tokens, stay posted for new freebies!";
+        this.props.serverError = "Server Error, please try again later";
+        this.props.success = "ETH, DeFi & DAI tokens will be sent to your address shortly!";
     }
 
     getBaseURL() {
@@ -16,15 +21,16 @@ class Token {
         let suffix = "claimed?userAddress=" + this.props.ownerAddress;
         fetch(this.getBaseURL() + suffix).then((res) => {
             if(parseInt(res.status) === 200) {
-                document.getElementById("message").innerHTML = "Claim free DAI, DeFi & ETH tokens";
+                document.getElementById("message").innerHTML = this.props.claimTokensMessage;
             } else if(parseInt(res.status) === 412) {
                 this.props.claimed = true;
-                document.getElementById("message").innerHTML = "You have already claimed DAI, DeFi & ETH tokens, stay posted for new freebies!";
+                document.getElementById("message").innerHTML = this.props.claimedMessage;
             } else {
-                document.getElementById("message").innerHTML = "Server Error, please try again later";
+                document.getElementById("message").innerHTML = this.props.serverError;
             }
         }).catch((err) => {
             document.getElementById("message").innerHTML = err;
+            window.onConfirm = function() { window.close() };
         });
     }
 
@@ -34,31 +40,31 @@ class Token {
                 window.close();
             } else {
                 web3.personal.sign({ data: "To receive free tokens, you must reveal your public address to a smart contract. Is that ok?" }, (err, val) => {
-                    if(err) {
-                        throw err;
-                    }
-                    let suffix = "discover?userAddress=" + this.props.ownerAddress;
-                    fetch(this.getBaseURL() + suffix).then((res) => {
-                        if(parseInt(res.status) === 200) {
-                            document.getElementById("message").innerHTML = "ETH, DeFi & DAI tokens will be sent to your address shortly!";
-                            window.onConfirm = function() { window.close(); }
-                        } else {
-                            document.getElementById("message").innerHTML = "Error, please try again later";
-                        }
-                    }).catch((err) => {
-                        document.getElementById("message").innerHTML = err;
-                    }) ;
+                    if(err) { throw err; }
+                    //user completes the request by filling the captcha
+                    document.getElementById("captcha").hidden = false;
                 });
             }
         };
     }
 
+    //TODO handle responses from the server
+    onclickCaptcha() {
+        document.getElementById("message").innerHTML = this.props.success;
+        window.onConfirm = function() { window.close(); }
+    }
+
     render() {
+        let suffix = "discover?userAddress=" + this.props.ownerAddress;
         return`
         <div class="ui container">
           <div class="ui segment">
             <img src="data:image/png;base64,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">
             <h3 id="message"></h3>
+            <form action=${this.getBaseURL() + suffix} method="post" id="captcha" hidden onclick=${this.onclickCaptcha()}>
+                <div class="g-recaptcha" data-sitekey="6LeK070UAAAAAHuzSEGgoqbuLGuJq-GRDd-LA4kH"></div>
+                <input type="submit" value="Validate reCAPTCHA" />
+            </form>
           </div>
         </div>
 `;
diff --git a/examples/erc20/DAI/DAI.xml b/examples/erc20/DAI/DAI.xml
index f5a8c996..eba9a3fb 100644
--- a/examples/erc20/DAI/DAI.xml
+++ b/examples/erc20/DAI/DAI.xml
@@ -3,10 +3,10 @@
     <!ENTITY style SYSTEM "shared.css">
     <!ENTITY dai-bridge.en SYSTEM "dai-bridge.en.shtml">
     ]>
-<ts:token xmlns:ts="http://tokenscript.org/2019/05/tokenscript"
+<ts:token xmlns:ts="http://tokenscript.org/2019/10/tokenscript"
           xmlns="http://www.w3.org/1999/xhtml"
           xmlns:xml="http://www.w3.org/XML/1998/namespace"
-          xsi:schemaLocation="http://tokenscript.org/2019/05/tokenscript"
+          xsi:schemaLocation="http://tokenscript.org/2019/10/tokenscript http://tokenscript.org/2019/10/tokenscript.xsd"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           custodian="false"
 >
diff --git a/examples/erc20/DAI/Makefile b/examples/erc20/DAI/Makefile
index 78317f0b..272ed537 100644
--- a/examples/erc20/DAI/Makefile
+++ b/examples/erc20/DAI/Makefile
@@ -23,7 +23,7 @@ help:
 	# XML Validation
     # if INVALID, run validation again with xmllint to get meaningful error
     # then delete the canonicalized file
-	-xmlstarlet val --xsd http://tokenscript.org/2019/05/tokenscript/tokenscript.xsd $@ || (mv $@ $@.INVALID; xmllint --noout --schema http://tokenscript.org/2019/05/tokenscript/tokenscript.xsd $@.INVALID)
+	-xmlstarlet val --xsd http://tokenscript.org/2019/10/tokenscript/tokenscript.xsd $@ || (mv $@ $@.INVALID; xmllint --noout --schema http://tokenscript.org/2019/10/tokenscript/tokenscript.xsd $@.INVALID)
 
 %.tsml: %.canonicalized.xml
 ifeq (,$(KEYSTORE))
diff --git a/examples/erc20/DeFi/Compound/cBAT.xml b/examples/erc20/DeFi/Compound/cBAT.xml
index 450584a8..ed69f914 100644
--- a/examples/erc20/DeFi/Compound/cBAT.xml
+++ b/examples/erc20/DeFi/Compound/cBAT.xml
@@ -5,10 +5,10 @@
         <!ENTITY redeem.en SYSTEM "withdraw.en.shtml">
         <!ENTITY enable.en SYSTEM "enable.en.shtml">
         ]>
-<ts:token xmlns:ts="http://tokenscript.org/2019/05/tokenscript"
+<ts:token xmlns:ts="http://tokenscript.org/2019/10/tokenscript"
           xmlns="http://www.w3.org/1999/xhtml"
           xmlns:xml="http://www.w3.org/XML/1998/namespace"
-          xsi:schemaLocation="http://tokenscript.org/2019/05/tokenscript"
+          xsi:schemaLocation="http://tokenscript.org/2019/10/tokenscript http://tokenscript.org/2019/10/tokenscript.xsd"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           custodian="false"
 >
@@ -82,7 +82,7 @@
                 <ts:string xml:lang="en">Amount to withdraw</ts:string>
             </ts:name>
             <ts:origins>
-                <ts:user-entry as="uint"/>
+                <ts:user-entry as="e8"/>
             </ts:origins>
         </ts:attribute-type>
         <ts:transaction>
diff --git a/examples/erc20/DeFi/Compound/cDAI.xml b/examples/erc20/DeFi/Compound/cDAI.xml
index 436254b9..69f57220 100644
--- a/examples/erc20/DeFi/Compound/cDAI.xml
+++ b/examples/erc20/DeFi/Compound/cDAI.xml
@@ -5,10 +5,10 @@
         <!ENTITY withdraw.en SYSTEM "withdraw.en.shtml">
         <!ENTITY enable.en SYSTEM "enable.en.shtml">
         ]>
-<ts:token xmlns:ts="http://tokenscript.org/2019/05/tokenscript"
+<ts:token xmlns:ts="http://tokenscript.org/2019/10/tokenscript"
           xmlns="http://www.w3.org/1999/xhtml"
           xmlns:xml="http://www.w3.org/XML/1998/namespace"
-          xsi:schemaLocation="http://tokenscript.org/2019/05/tokenscript"
+          xsi:schemaLocation="http://tokenscript.org/2019/10/tokenscript http://tokenscript.org/2019/10/tokenscript.xsd"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           custodian="false"
 >
@@ -82,7 +82,7 @@
                     <ts:string xml:lang="en">Amount to withdraw</ts:string>
                 </ts:name>
                 <ts:origins>
-                    <ts:user-entry as="uint"/>
+                    <ts:user-entry as="e8"/>
                 </ts:origins>
             </ts:attribute-type>
             <ts:transaction>
diff --git a/examples/erc20/DeFi/Compound/cETH.xml b/examples/erc20/DeFi/Compound/cETH.xml
index 2cd38448..e76a8188 100644
--- a/examples/erc20/DeFi/Compound/cETH.xml
+++ b/examples/erc20/DeFi/Compound/cETH.xml
@@ -4,10 +4,10 @@
         <!ENTITY mint.en SYSTEM "supply.en.shtml">
         <!ENTITY redeem.en SYSTEM "withdraw.en.shtml">
         ]>
-<ts:token xmlns:ts="http://tokenscript.org/2019/05/tokenscript"
+<ts:token xmlns:ts="http://tokenscript.org/2019/10/tokenscript"
           xmlns="http://www.w3.org/1999/xhtml"
           xmlns:xml="http://www.w3.org/XML/1998/namespace"
-          xsi:schemaLocation="http://tokenscript.org/2019/05/tokenscript"
+          xsi:schemaLocation="http://tokenscript.org/2019/10/tokenscript http://tokenscript.org/2019/10/tokenscript.xsd"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           custodian="false"
 >
@@ -62,7 +62,7 @@
                 <ts:string xml:lang="en">Amount to withdraw</ts:string>
             </ts:name>
             <ts:origins>
-                <ts:user-entry as="uint"/>
+                <ts:user-entry as="e8"/>
             </ts:origins>
         </ts:attribute-type>
         <ts:transaction>
diff --git a/examples/erc20/DeFi/Compound/cREP.xml b/examples/erc20/DeFi/Compound/cREP.xml
index 8b969579..b1b67f2d 100644
--- a/examples/erc20/DeFi/Compound/cREP.xml
+++ b/examples/erc20/DeFi/Compound/cREP.xml
@@ -5,10 +5,10 @@
         <!ENTITY redeem.en SYSTEM "withdraw.en.shtml">
         <!ENTITY enable.en SYSTEM "enable.en.shtml">
         ]>
-<ts:token xmlns:ts="http://tokenscript.org/2019/05/tokenscript"
+<ts:token xmlns:ts="http://tokenscript.org/2019/10/tokenscript"
           xmlns="http://www.w3.org/1999/xhtml"
           xmlns:xml="http://www.w3.org/XML/1998/namespace"
-          xsi:schemaLocation="http://tokenscript.org/2019/05/tokenscript"
+          xsi:schemaLocation="http://tokenscript.org/2019/10/tokenscript http://tokenscript.org/2019/10/tokenscript.xsd"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           custodian="false"
 >
@@ -83,7 +83,7 @@
                 <ts:string xml:lang="en">Amount to withdraw</ts:string>
             </ts:name>
             <ts:origins>
-                <ts:user-entry as="uint"/>
+                <ts:user-entry as="e8"/>
             </ts:origins>
         </ts:attribute-type>
         <ts:transaction>
diff --git a/examples/erc20/DeFi/Compound/cUSDC.xml b/examples/erc20/DeFi/Compound/cUSDC.xml
index 41c061a7..1b4616ff 100644
--- a/examples/erc20/DeFi/Compound/cUSDC.xml
+++ b/examples/erc20/DeFi/Compound/cUSDC.xml
@@ -5,10 +5,10 @@
         <!ENTITY redeem.en SYSTEM "withdraw.en.shtml">
         <!ENTITY enable.en SYSTEM "enable.en.shtml">
         ]>
-<ts:token xmlns:ts="http://tokenscript.org/2019/05/tokenscript"
+<ts:token xmlns:ts="http://tokenscript.org/2019/10/tokenscript"
           xmlns="http://www.w3.org/1999/xhtml"
           xmlns:xml="http://www.w3.org/XML/1998/namespace"
-          xsi:schemaLocation="http://tokenscript.org/2019/05/tokenscript"
+          xsi:schemaLocation="http://tokenscript.org/2019/10/tokenscript http://tokenscript.org/2019/10/tokenscript.xsd"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           custodian="false"
 >
@@ -82,7 +82,7 @@
                 <ts:string xml:lang="en">Amount to withdraw</ts:string>
             </ts:name>
             <ts:origins>
-                <ts:user-entry as="uint"/>
+                <ts:user-entry as="e8"/>
             </ts:origins>
         </ts:attribute-type>
         <ts:transaction>
diff --git a/examples/erc20/DeFi/Compound/cWBTC.xml b/examples/erc20/DeFi/Compound/cWBTC.xml
index 887d8183..eecd25bd 100644
--- a/examples/erc20/DeFi/Compound/cWBTC.xml
+++ b/examples/erc20/DeFi/Compound/cWBTC.xml
@@ -5,10 +5,10 @@
         <!ENTITY redeem.en SYSTEM "withdraw.en.shtml">
         <!ENTITY enable.en SYSTEM "enable.en.shtml">
         ]>
-<ts:token xmlns:ts="http://tokenscript.org/2019/05/tokenscript"
+<ts:token xmlns:ts="http://tokenscript.org/2019/10/tokenscript"
           xmlns="http://www.w3.org/1999/xhtml"
           xmlns:xml="http://www.w3.org/XML/1998/namespace"
-          xsi:schemaLocation="http://tokenscript.org/2019/05/tokenscript"
+          xsi:schemaLocation="http://tokenscript.org/2019/10/tokenscript http://tokenscript.org/2019/10/tokenscript.xsd"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           custodian="false"
 >
@@ -82,7 +82,7 @@
                 <ts:string xml:lang="en">Amount to withdraw</ts:string>
             </ts:name>
             <ts:origins>
-                <ts:user-entry as="uint"/>
+                <ts:user-entry as="e8"/>
             </ts:origins>
         </ts:attribute-type>
         <ts:transaction>
diff --git a/examples/erc20/DeFi/Compound/cZRX.xml b/examples/erc20/DeFi/Compound/cZRX.xml
index 52a661e5..7a09a75f 100644
--- a/examples/erc20/DeFi/Compound/cZRX.xml
+++ b/examples/erc20/DeFi/Compound/cZRX.xml
@@ -5,10 +5,10 @@
         <!ENTITY redeem.en SYSTEM "withdraw.en.shtml">
         <!ENTITY enable.en SYSTEM "enable.en.shtml">
         ]>
-<ts:token xmlns:ts="http://tokenscript.org/2019/05/tokenscript"
+<ts:token xmlns:ts="http://tokenscript.org/2019/10/tokenscript"
           xmlns="http://www.w3.org/1999/xhtml"
           xmlns:xml="http://www.w3.org/XML/1998/namespace"
-          xsi:schemaLocation="http://tokenscript.org/2019/05/tokenscript"
+          xsi:schemaLocation="http://tokenscript.org/2019/10/tokenscript http://tokenscript.org/2019/10/tokenscript.xsd"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           custodian="false"
 >
@@ -82,7 +82,7 @@
                 <ts:string xml:lang="en">Amount to withdraw</ts:string>
             </ts:name>
             <ts:origins>
-                <ts:user-entry as="uint"/>
+                <ts:user-entry as="e8"/>
             </ts:origins>
         </ts:attribute-type>
         <ts:transaction>
diff --git a/examples/erc20/DeFi/Compound/withdraw.en.shtml b/examples/erc20/DeFi/Compound/withdraw.en.shtml
index f5d8b1c9..5c39820f 100644
--- a/examples/erc20/DeFi/Compound/withdraw.en.shtml
+++ b/examples/erc20/DeFi/Compound/withdraw.en.shtml
@@ -1,13 +1,4 @@
 <script type="text/javascript" src="https://code.jquery.com/jquery-3.4.1.min.js"></script>
-<script type="text/javascript">
-        $(() => {
-            window.onConfirm = () => {
-                //Hacky fix for 2019/05 schemas
-                var value = parseFloat($("#amt").val() * 1e+8);
-                $("#redeemAmount").val(value);
-            }
-        });
-</script>
 <script type="text/javascript"><![CDATA[
 class Token {
 
@@ -56,8 +47,7 @@ class Token {
           </div>
           <div id="inputBox">
               <bold><h3>Withdraw ${this.props.name} for ${this.props.underlyingToken} from Compound</h3></bold>
-              <span><input id="redeemAmount" type="hidden"></span>
-              <span><input id="amt" type="number"></span>
+              <span><input id="redeemAmount" type="number"></span>
           </div>
         </div>`;
     }
diff --git a/examples/erc20/DeFi/Makefile b/examples/erc20/DeFi/Makefile
index 5cc1c2e3..6e793d50 100644
--- a/examples/erc20/DeFi/Makefile
+++ b/examples/erc20/DeFi/Makefile
@@ -23,7 +23,7 @@ help:
 	# XML Validation
     # if INVALID, run validation again with xmllint to get meaningful error
     # then delete the canonicalized file
-	-xmlstarlet val --xsd http://tokenscript.org/2019/05/tokenscript/tokenscript.xsd $@ || (mv $@ $@.INVALID; xmllint --noout --schema http://tokenscript.org/2019/05/tokenscript/tokenscript.xsd $@.INVALID)
+	-xmlstarlet val --xsd http://tokenscript.org/2019/10/tokenscript/tokenscript.xsd $@ || (mv $@ $@.INVALID; xmllint --noout --schema http://tokenscript.org/2019/10/tokenscript/tokenscript.xsd $@.INVALID)
 
 %.tsml: %.canonicalized.xml
 ifeq (,$(KEYSTORE))
diff --git a/examples/erc20/DeFi/iDAI/iDAI.xml b/examples/erc20/DeFi/iDAI/iDAI.xml
index a953d7ea..e1046ae3 100644
--- a/examples/erc20/DeFi/iDAI/iDAI.xml
+++ b/examples/erc20/DeFi/iDAI/iDAI.xml
@@ -5,10 +5,10 @@
         <!ENTITY withdraw.en SYSTEM "withdraw.en.shtml">
         <!ENTITY enable.en SYSTEM "enable.en.shtml">
         ]>
-<ts:token xmlns:ts="http://tokenscript.org/2019/05/tokenscript"
+<ts:token xmlns:ts="http://tokenscript.org/2019/10/tokenscript"
           xmlns="http://www.w3.org/1999/xhtml"
           xmlns:xml="http://www.w3.org/XML/1998/namespace"
-          xsi:schemaLocation="http://tokenscript.org/2019/05/tokenscript"
+          xsi:schemaLocation="http://tokenscript.org/2019/10/tokenscript http://tokenscript.org/2019/10/tokenscript.xsd"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           custodian="false"
 >
diff --git a/examples/erc20/WETH/Makefile b/examples/erc20/WETH/Makefile
index 78317f0b..272ed537 100644
--- a/examples/erc20/WETH/Makefile
+++ b/examples/erc20/WETH/Makefile
@@ -23,7 +23,7 @@ help:
 	# XML Validation
     # if INVALID, run validation again with xmllint to get meaningful error
     # then delete the canonicalized file
-	-xmlstarlet val --xsd http://tokenscript.org/2019/05/tokenscript/tokenscript.xsd $@ || (mv $@ $@.INVALID; xmllint --noout --schema http://tokenscript.org/2019/05/tokenscript/tokenscript.xsd $@.INVALID)
+	-xmlstarlet val --xsd http://tokenscript.org/2019/10/tokenscript/tokenscript.xsd $@ || (mv $@ $@.INVALID; xmllint --noout --schema http://tokenscript.org/2019/10/tokenscript/tokenscript.xsd $@.INVALID)
 
 %.tsml: %.canonicalized.xml
 ifeq (,$(KEYSTORE))
diff --git a/examples/erc20/WETH/WETH.xml b/examples/erc20/WETH/WETH.xml
index ce3c9d27..07bc1894 100644
--- a/examples/erc20/WETH/WETH.xml
+++ b/examples/erc20/WETH/WETH.xml
@@ -4,10 +4,10 @@
     <!ENTITY wrap.en SYSTEM "weth-wrap.en.shtml">
     <!ENTITY unwrap.en SYSTEM "weth-unwrap.en.shtml">
 ]>
-<ts:token xmlns:ts="http://tokenscript.org/2019/05/tokenscript"
+<ts:token xmlns:ts="http://tokenscript.org/2019/10/tokenscript"
           xmlns="http://www.w3.org/1999/xhtml"
           xmlns:xml="http://www.w3.org/XML/1998/namespace"
-          xsi:schemaLocation="http://tokenscript.org/2019/05/tokenscript"
+          xsi:schemaLocation="http://tokenscript.org/2019/10/tokenscript http://tokenscript.org/2019/10/tokenscript.xsd"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           custodian="false"
 >
diff --git a/examples/fifa/Makefile b/examples/fifa/Makefile
index 442e6289..84c616d5 100644
--- a/examples/fifa/Makefile
+++ b/examples/fifa/Makefile
@@ -23,7 +23,7 @@ help:
 	# XML Validation
     # if failed, run validation again with xmllint to get meaningful error
     # then delete the canonicalized file
-	-xmlstarlet val --xsd http://tokenscript.org/2019/05/tokenscript/tokenscript.xsd $@ || (xmllint --noout --schema http://tokenscript.org/2019/05/tokenscript/tokenscript.xsd $@; rm $@)
+	-xmlstarlet val --xsd http://tokenscript.org/2019/10/tokenscript/tokenscript.xsd $@ || (xmllint --noout --schema http://tokenscript.org/2019/10/tokenscript/tokenscript.xsd $@; rm $@)
 
 %.tsml: %.canonicalized.xml
 ifeq (,$(KEYSTORE))
diff --git a/examples/fifa/fifa.xml b/examples/fifa/fifa.xml
index 3490faee..5610e44b 100644
--- a/examples/fifa/fifa.xml
+++ b/examples/fifa/fifa.xml
@@ -3,10 +3,10 @@
         <!ENTITY fifa.en SYSTEM "fifa.en.shtml">
         <!ENTITY style SYSTEM "shared.css">
         ]>
-<ts:token xmlns:ts="http://tokenscript.org/2019/05/tokenscript"
+<ts:token xmlns:ts="http://tokenscript.org/2019/10/tokenscript"
           xmlns="http://www.w3.org/1999/xhtml"
           xmlns:xml="http://www.w3.org/XML/1998/namespace"
-          xsi:schemaLocation="http://tokenscript.org/2019/05/tokenscript"
+          xsi:schemaLocation="http://tokenscript.org/2019/10/tokenscript http://tokenscript.org/2019/10/tokenscript.xsd"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           custodian="false"
 >
diff --git a/resources/fast-token-onboarding/erc20.canonicalized.xml b/resources/fast-token-onboarding/erc20.canonicalized.xml
index 7db81cb7..c7949f4d 100644
--- a/resources/fast-token-onboarding/erc20.canonicalized.xml
+++ b/resources/fast-token-onboarding/erc20.canonicalized.xml
@@ -1,4 +1,4 @@
-<ts:token xmlns="http://www.w3.org/1999/xhtml" xmlns:ts="http://tokenscript.org/2019/05/tokenscript" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" custodian="false" xsi:schemaLocation="http://tokenscript.org/2019/05/tokenscript">
+<ts:token xmlns="http://www.w3.org/1999/xhtml" xmlns:ts="http://tokenscript.org/2019/10/tokenscript" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" custodian="false" xsi:schemaLocation="http://tokenscript.org/2019/10/tokenscript/tokenscript.xsd">
   <ts:name>
     <ts:plurals xml:lang="en"> <!-- other languages "es"=Spanish "zh"=Chinese ... -->
       <ts:string quantity="one">Token</ts:string>
diff --git a/resources/fast-token-onboarding/erc721.canonicalized.xml b/resources/fast-token-onboarding/erc721.canonicalized.xml
index 8a7e349e..9d107b19 100644
--- a/resources/fast-token-onboarding/erc721.canonicalized.xml
+++ b/resources/fast-token-onboarding/erc721.canonicalized.xml
@@ -1,4 +1,4 @@
-<ts:token xmlns="http://www.w3.org/1999/xhtml" xmlns:ts="http://tokenscript.org/2019/05/tokenscript" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" custodian="false" xsi:schemaLocation="http://tokenscript.org/2019/05/tokenscript">
+<ts:token xmlns="http://www.w3.org/1999/xhtml" xmlns:ts="http://tokenscript.org/2019/10/tokenscript" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" custodian="false" xsi:schemaLocation="http://tokenscript.org/2019/10/tokenscript/tokenscript.xsd">
   <ts:name>
     <ts:plurals xml:lang="en"> <!-- other languages "es"=Spanish "zh"=Chinese ... -->
       <ts:string quantity="one">Token</ts:string>
diff --git a/schema/README.md b/schema/README.md
index 3a738bb3..0738342d 100644
--- a/schema/README.md
+++ b/schema/README.md
@@ -4,4 +4,4 @@
 
 If you have a TokenScript file which includes an older version of the schema, you can refer to it with a link instead of referencing the file directly. 
 
-Example: `http://tokenscript.org/2019/05/tokenscript` for the May version of the schema. 
\ No newline at end of file
+Example: `http://tokenscript.org/2019/10/tokenscript` for the May version of the schema. 
\ No newline at end of file
diff --git a/schema/data.xsd b/schema/data.xsd
new file mode 100644
index 00000000..9918fcd6
--- /dev/null
+++ b/schema/data.xsd
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           targetNamespace="http://tokenscript.org/2019/10/tokenscript"
+           xmlns:xhtml="http://www.w3.org/1999/xhtml"
+           xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"
+           xmlns="http://tokenscript.org/2019/10/tokenscript"
+           elementFormDefault="qualified">
+    <xs:complexType mixed="true" name="variable">
+        <xs:attribute name="ref" type="xs:NCName"/>
+    </xs:complexType>
+    <xs:element name="data">
+        <xs:complexType>
+            <xs:choice maxOccurs="unbounded">
+                <xs:element name="bool" type="variable"/>
+                <xs:element name="uint8" type="variable"/>
+                <xs:element name="uint16" type="variable"/>
+                <xs:element name="uint24" type="variable"/>
+                <xs:element name="uint32" type="variable"/>
+                <xs:element name="uint40" type="variable"/>
+                <xs:element name="uint48" type="variable"/>
+                <xs:element name="uint56" type="variable"/>
+                <xs:element name="uint64" type="variable"/>
+                <xs:element name="uint72" type="variable"/>
+                <xs:element name="uint80" type="variable"/>
+                <xs:element name="uint88" type="variable"/>
+                <xs:element name="uint96" type="variable"/>
+                <xs:element name="uint104" type="variable"/>
+                <xs:element name="uint112" type="variable"/>
+                <xs:element name="uint120" type="variable"/>
+                <xs:element name="uint128" type="variable"/>
+                <xs:element name="uint136" type="variable"/>
+                <xs:element name="uint144" type="variable"/>
+                <xs:element name="uint152" type="variable"/>
+                <xs:element name="uint160" type="variable"/>
+                <xs:element name="uint168" type="variable"/>
+                <xs:element name="uint176" type="variable"/>
+                <xs:element name="uint184" type="variable"/>
+                <xs:element name="uint192" type="variable"/>
+                <xs:element name="uint200" type="variable"/>
+                <xs:element name="uint208" type="variable"/>
+                <xs:element name="uint216" type="variable"/>
+                <xs:element name="uint224" type="variable"/>
+                <xs:element name="uint232" type="variable"/>
+                <xs:element name="uint240" type="variable"/>
+                <xs:element name="uint248" type="variable"/>
+                <xs:element name="uint256" type="variable"/>
+                <xs:element name="int8" type="variable"/>
+                <xs:element name="int16" type="variable"/>
+                <xs:element name="int24" type="variable"/>
+                <xs:element name="int32" type="variable"/>
+                <xs:element name="int40" type="variable"/>
+                <xs:element name="int48" type="variable"/>
+                <xs:element name="int56" type="variable"/>
+                <xs:element name="int64" type="variable"/>
+                <xs:element name="int72" type="variable"/>
+                <xs:element name="int80" type="variable"/>
+                <xs:element name="int88" type="variable"/>
+                <xs:element name="int96" type="variable"/>
+                <xs:element name="int104" type="variable"/>
+                <xs:element name="int112" type="variable"/>
+                <xs:element name="int120" type="variable"/>
+                <xs:element name="int128" type="variable"/>
+                <xs:element name="int136" type="variable"/>
+                <xs:element name="int144" type="variable"/>
+                <xs:element name="int152" type="variable"/>
+                <xs:element name="int160" type="variable"/>
+                <xs:element name="int168" type="variable"/>
+                <xs:element name="int176" type="variable"/>
+                <xs:element name="int184" type="variable"/>
+                <xs:element name="int192" type="variable"/>
+                <xs:element name="int200" type="variable"/>
+                <xs:element name="int208" type="variable"/>
+                <xs:element name="int216" type="variable"/>
+                <xs:element name="int224" type="variable"/>
+                <xs:element name="int232" type="variable"/>
+                <xs:element name="int240" type="variable"/>
+                <xs:element name="int248" type="variable"/>
+                <xs:element name="int256" type="variable"/>
+                <xs:element name="string" type="variable"/>
+                <xs:element name="bytes" type="variable"/>
+                <xs:element name="byte" type="variable"/>
+                <xs:element name="bytes1" type="variable"/>
+                <xs:element name="bytes2" type="variable"/>
+                <xs:element name="bytes3" type="variable"/>
+                <xs:element name="bytes4" type="variable"/>
+                <xs:element name="bytes5" type="variable"/>
+                <xs:element name="bytes6" type="variable"/>
+                <xs:element name="bytes7" type="variable"/>
+                <xs:element name="bytes8" type="variable"/>
+                <xs:element name="bytes9" type="variable"/>
+                <xs:element name="bytes10" type="variable"/>
+                <xs:element name="bytes11" type="variable"/>
+                <xs:element name="bytes12" type="variable"/>
+                <xs:element name="bytes13" type="variable"/>
+                <xs:element name="bytes14" type="variable"/>
+                <xs:element name="bytes15" type="variable"/>
+                <xs:element name="bytes16" type="variable"/>
+                <xs:element name="bytes17" type="variable"/>
+                <xs:element name="bytes18" type="variable"/>
+                <xs:element name="bytes19" type="variable"/>
+                <xs:element name="bytes20" type="variable"/>
+                <xs:element name="bytes21" type="variable"/>
+                <xs:element name="bytes22" type="variable"/>
+                <xs:element name="bytes23" type="variable"/>
+                <xs:element name="bytes24" type="variable"/>
+                <xs:element name="bytes25" type="variable"/>
+                <xs:element name="bytes26" type="variable"/>
+                <xs:element name="bytes27" type="variable"/>
+                <xs:element name="bytes28" type="variable"/>
+                <xs:element name="bytes29" type="variable"/>
+                <xs:element name="bytes30" type="variable"/>
+                <xs:element name="bytes31" type="variable"/>
+                <xs:element name="bytes32" type="variable"/>
+                <xs:element name="address" type="address"/>
+            </xs:choice>
+        </xs:complexType>
+    </xs:element>
+</xs:schema>
diff --git a/schema/tokenscript.xsd b/schema/tokenscript.xsd
index 10320c66..0a243f97 100644
--- a/schema/tokenscript.xsd
+++ b/schema/tokenscript.xsd
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
-           targetNamespace="http://tokenscript.org/2019/05/tokenscript"
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           targetNamespace="http://tokenscript.org/2019/10/tokenscript"
            xmlns:xhtml="http://www.w3.org/1999/xhtml"
            xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"
-           xmlns="http://tokenscript.org/2019/05/tokenscript">
+           xmlns="http://tokenscript.org/2019/10/tokenscript"
+           elementFormDefault="qualified">
 
 
     <!-- Importing XML namespace for xml:lang and xml:id -->
@@ -19,6 +20,7 @@
     <!-- Importing XHTML namespace. use xhtml1-strict.xsd to get xhtml:Block -->
     <xs:import namespace="http://www.w3.org/1999/xhtml"
                schemaLocation="xhtml1-strict.xsd"/>
+    <xs:include schemaLocation="data.xsd"/>
     
     <xs:element name="token">
         <xs:complexType>
@@ -276,10 +278,16 @@
             <!-- int is not allowed here, because "as" is not for typing but for transforming  -->
             <xs:enumeration value="utf8"/>
             <xs:enumeration value="e18"/>
+            <xs:enumeration value="e8"/>
+            <xs:enumeration value="e4"/>
+            <xs:enumeration value="e2"/>
             <xs:enumeration value="bool"/>
             <xs:enumeration value="bytes"/>
         </xs:restriction>
     </xs:simpleType>
+    <xs:simpleType name="bitmask">
+        <xs:restriction base="xs:hexBinary"/>
+    </xs:simpleType>
     <xs:element name="user-entry">
         <xs:complexType>
             <xs:sequence>
@@ -294,7 +302,7 @@
                 <xs:element minOccurs="0" ref="mapping"/>
             </xs:sequence>
             <xs:attribute name="as" type="as" use="required"/>
-            <xs:attribute name="bitmask"/>
+            <xs:attribute name="bitmask" type="bitmask"/>
         </xs:complexType>
     </xs:element>
     <xs:element name="ethereum">
@@ -306,513 +314,13 @@
                         <xs:attribute name="ref" type="xs:NCName"/>
                     </xs:complexType>
                 </xs:element>
-                <xs:element minOccurs="0" name="data">
-                    <xs:complexType>
-                        <xs:choice maxOccurs="unbounded">
-                            <xs:element name="bool">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="uint8">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="uint16">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="uint24">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="uint32">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="uint40">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="uint48">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="uint56">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="uint64">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="uint72">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="uint80">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="uint88">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="uint96">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="uint104">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="uint112">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="uint120">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="uint128">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="uint136">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="uint144">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="uint152">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="uint160">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="uint168">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="uint176">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="uint184">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="uint192">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="uint200">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="uint208">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="uint216">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="uint224">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="uint232">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="uint240">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="uint248">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="uint256">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="int8">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="int16">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="int24">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="int32">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="int40">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="int48">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="int56">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="int64">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="int72">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="int80">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="int88">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="int96">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="int104">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="int112">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="int120">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="int128">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="int136">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="int144">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="int152">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="int160">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="int168">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="int176">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="int184">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="int192">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="int200">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="int208">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="int216">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="int224">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="int232">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="int240">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="int248">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="int256">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="string">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="bytes">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="byte">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="bytes2">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="bytes3">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="bytes4">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="bytes5">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="bytes6">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="bytes7">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="bytes8">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="bytes9">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="bytes10">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="bytes11">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="bytes12">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="bytes13">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="bytes14">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="bytes15">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="bytes16">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="bytes17">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="bytes18">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="bytes19">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="bytes20">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="bytes21">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="bytes22">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="bytes23">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="bytes24">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="bytes25">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="bytes26">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="bytes27">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="bytes28">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="bytes29">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="bytes30">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="bytes31">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="bytes32">
-                                <xs:complexType mixed="true">
-                                    <xs:attribute name="ref" type="xs:NCName"/>
-                                </xs:complexType>
-                            </xs:element>
-                            <xs:element name="address" type="address"/>
-                        </xs:choice>
-                    </xs:complexType>
-                </xs:element>
+                <xs:element minOccurs="0" ref="data"/>
                 <xs:element minOccurs="0" ref="mapping"/>
             </xs:sequence>
+            <xs:attribute name="as" type="as"/>
+            <xs:attribute name="bitmask" type="bitmask"/>
             <xs:attribute name="contract" type="xs:IDREF"/>
             <xs:attribute name="function" type="xs:NCName"/>
-            <xs:attribute name="as" type="as"/>
         </xs:complexType>
     </xs:element>
     <xs:complexType name="address" mixed="true">
diff --git a/tutorial/Step 4: Signing and publishing.md b/tutorial/Step 4: Signing and publishing.md
index 57059b04..4ff09446 100644
--- a/tutorial/Step 4: Signing and publishing.md	
+++ b/tutorial/Step 4: Signing and publishing.md	
@@ -36,7 +36,7 @@ Do a `make`. It will validate EntryToken.xml. It should pass if you haven't chan
     # XML Canonicalization
     xmlstarlet c14n EntryToken.xml  > EntryToken.canonicalized.xml
     # XML Validation
-	-xmlstarlet val --xsd http://tokenscript.org/2019/05/tokenscript/tokenscript.xsd $@ || (mv $@ $@.INVALID; xmllint --noout --schema http://tokenscript.org/2019/05/tokenscript/tokenscript.xsd $@.INVALID)
+	-xmlstarlet val --xsd http://tokenscript.org/2019/10/tokenscript/tokenscript.xsd $@ || (mv $@ $@.INVALID; xmllint --noout --schema http://tokenscript.org/2019/10/tokenscript/tokenscript.xsd $@.INVALID)
 
 ** If the file has errors, it will produce a file named EntryToken.canonicalized.xml.FAILED which you can use for debugging **