Regen docsite

2025-02-20 09:26:41 +00:00 · 2016-11-18 13:57:39 +01:00 · 2016-11-18 13:57:39 +01:00 · 648ab43e35
commit 648ab43e35
parent 1d9511f944
489 changed files with 4956 additions and 2537 deletions
--- a/docs/build/doctrees/clientrpc.doctree
+++ b/docs/build/doctrees/clientrpc.doctree
--- a/docs/build/doctrees/corda-configuration-files.doctree
+++ b/docs/build/doctrees/corda-configuration-files.doctree
--- a/docs/build/doctrees/creating-a-cordapp.doctree
+++ b/docs/build/doctrees/creating-a-cordapp.doctree
--- a/docs/build/doctrees/environment.pickle
+++ b/docs/build/doctrees/environment.pickle
--- a/docs/build/doctrees/event-scheduling.doctree
+++ b/docs/build/doctrees/event-scheduling.doctree
--- a/docs/build/doctrees/getting-set-up.doctree
+++ b/docs/build/doctrees/getting-set-up.doctree
--- a/docs/build/doctrees/index.doctree
+++ b/docs/build/doctrees/index.doctree
--- a/docs/build/doctrees/initialmarginagreement.doctree
+++ b/docs/build/doctrees/initialmarginagreement.doctree
--- a/docs/build/doctrees/loadtesting.doctree
+++ b/docs/build/doctrees/loadtesting.doctree
--- a/docs/build/doctrees/messaging.doctree
+++ b/docs/build/doctrees/messaging.doctree
--- a/docs/build/doctrees/network-simulator.doctree
+++ b/docs/build/doctrees/network-simulator.doctree
--- a/docs/build/doctrees/running-the-demos.doctree
+++ b/docs/build/doctrees/running-the-demos.doctree
--- a/docs/build/doctrees/tutorial-attachments.doctree
+++ b/docs/build/doctrees/tutorial-attachments.doctree
--- a/docs/build/doctrees/tutorial-clientrpc-api.doctree
+++ b/docs/build/doctrees/tutorial-clientrpc-api.doctree
--- a/docs/build/html/.buildinfo
+++ b/docs/build/html/.buildinfo
@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: ad4aa434cfebd269fdbb85815bc6eb43
+config: 02da61908148262295ef57918c434b8d
 tags: 645f666f9bcd5a90fca523b33c5a78b7
--- a/docs/build/html/_sources/clientrpc.txt
+++ b/docs/build/html/_sources/clientrpc.txt
@ -21,9 +21,8 @@ Security
 --------

 Users wanting to use the RPC library are first required to authenticate themselves with the node using a valid username
-and password. These are kept in ``rpc-users.properties`` in the node base directory. This file also specifies
-permissions for each user, which the RPC implementation can use to control access. The file format is described in
-:doc:`corda-configuration-files`.
+and password. These are specified in the configuration file. Each user can be configured with a set of permissions which
+the RPC can use for fine-grain access control.

 Observables
 -----------
--- a/docs/build/html/_sources/corda-configuration-files.txt
+++ b/docs/build/html/_sources/corda-configuration-files.txt
@ -8,7 +8,7 @@ The Corda all-in-one ``corda.jar`` file is generated by the ``gradle buildCordaJ
 This behaviour can be overidden using the ``--config-file`` command line option to target configuration files with different names, or different file location (relative paths are relative to the current working directory).
 Also, the ``--base-directory`` command line option alters the Corda node workspace location and if specified a ``node.conf`` configuration file is then expected in the root of the workspace.

-The configuration file templates used for the ``gradle installTemplateNodes`` task are to be found in the ``/config/dev`` folder. Also note that there is a basic set of defaults loaded from
+The configuration file templates used for the ``gradle deployNodes`` task are to be found in the ``/config/dev`` folder. Also note that there is a basic set of defaults loaded from
 the built in resource file ``/node/src/main/resources/reference.conf`` of the ``:node`` gradle module. All properties in this can be overidden in the file configuration
 and for rarely changed properties this defaulting allows the property to be excluded from the configuration file.

@ -41,6 +41,9 @@ General node configuration file for hosting the IRSDemo services.
    extraAdvertisedServiceIds: "corda.interest_rates"
    networkMapAddress : "localhost:12345"
    useHTTPS : false
+    rpcUsers : [
+        { user=user1, password=letmein, permissions=[ cash ] }
+    ]

 NetworkMapService plus Simple Notary configuration file.

@ -97,20 +100,12 @@ Configuration File Fields

 :useHTTPS: If false the node's web server will be plain HTTP. If true the node will use the same certificate and private key from the ``<workspace>/certificates/sslkeystore.jks`` file as the ArtemisMQ port for HTTPS. If HTTPS is enabled then unencrypted HTTP traffic to the node's **webAddress** port is not supported.

-RPC Users File
-==============
+:rpcUsers:
+    A list of users who are authorised to access the RPC system. Each user in the list is a config object with the
+    following fields:

-Corda also uses the ``rpc-users.properties`` file, found in the base directory, to control access to the RPC subsystem.
-This is a Java properties file (details can be found in the `Javadocs <https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html#load-java.io.Reader->`_)
-which specifies a list of users with their password and list of permissions they're enabled for.
+        :user: Username consisting only of word characters (a-z, A-Z, 0-9 and _)
+        :password: The password
+        :permissions: A list of permission strings which RPC methods can use to control access

-.. code-block:: text
-    :caption: Sample
-
-    admin=notsecure,ADMIN
-    user1=letmein,CASH,PAPER
-
-In this example ``user1`` has password ``letmein`` and has permissions for ``CASH`` and ``PAPER``. The permissions are
-free-form strings which can be used by the RPC methods to control access.
-
-If ``rpc-users.properties`` is empty or doesn't exist then the RPC subsystem is effectively locked down.
+    If this field is absent or an empty list then RPC is effectively locked down.
--- a/docs/build/html/_sources/creating-a-cordapp.txt
+++ b/docs/build/html/_sources/creating-a-cordapp.txt
@ -29,17 +29,21 @@ construction, where message handlers should be registered and threads started.
 Starting Nodes
 --------------

-To use an app you must also have a node server. To create a node server run the gradle installTemplateNodes task.
+To use an app you must also have a node server. To create a node server run the ``gradle deployNodes`` task.

 This will output the node JAR to ``build/libs/corda.jar`` and several sample/standard
 node setups to ``build/nodes``. For now you can use the ``build/nodes/nodea`` configuration as a template.

 Each node server by default must have a ``node.conf`` file in the current working directory. After first
-execution of the node server there will be many other configuration and persistence files created in a node workspace directory. This is specified as the basedir property of the node.conf file, or else can be overidden using ``--base-directory=<workspace>``.
+execution of the node server there will be many other configuration and persistence files created in a node
+workspace directory. This is specified as the basedir property of the node.conf file, or else can be overidden
+using ``--base-directory=<workspace>``.

 .. note:: Outside of development environments do not store your node directories in the build folder.

-.. warning:: Also note that the bootstrapping process of the ``corda.jar`` unpacks the Corda dependencies into a temporary folder. It is therefore suggested that the CAPSULE_CACHE_DIR environment variable be set before starting the process to control this location.
+.. warning:: Also note that the bootstrapping process of the ``corda.jar`` unpacks the Corda dependencies into a
+   temporary folder. It is therefore suggested that the CAPSULE_CACHE_DIR environment variable be set before
+   starting the process to control this location.

 Installing Apps
 ---------------
@ -240,7 +244,9 @@ You can create more configurations with new tasks that extend Cordform.

 New nodes can be added by simply adding another node block and giving it a different name, directory and ports. When you
 run this task it will install the nodes to the directory specified and a script will be generated (for UNIX users only
-at present) to run the nodes with one command.
+at present) to run the nodes with one command (``runnodes``). On MacOS X this script will run each node in a new
+terminal tab, and on Linux it will open up a new XTerm for each node. On Windows the (``runnodes.bat``) script will run
+one node per window.

 Other cordapps can also be specified if they are already specified as classpath or compile dependencies in your
 ``build.gradle``.
--- a/docs/build/html/_sources/index.txt
+++ b/docs/build/html/_sources/index.txt
@ -10,9 +10,12 @@ of documentation you may find useful, from highest level to lowest:
 1. The `Introductory white paper`_ describes the motivating vision and background of the project. It is the kind
   of document your boss should read. It describes why the project exists and briefly compares it to alternative
   systems on the market.
-2. This user guide. It describes *how* to use the system to write apps. It assumes you already have read the
-   relevant sections of the technology white paper and now wish to learn how to use it.
-3. The `API docs`_.
+2. The `Technical white paper`_ describes the entire intended design from beginning to end. It is the kind of
+   document that you should read, or at least, read parts of. Note that because the technical white paper
+   describes the intended end state, it does not always align with the implementation.
+3. This user guide. It describes *how* to use the system to write apps, as currently implemented. It assumes
+   you already have read the relevant sections of the technology white paper and now wish to learn how to use it.
+4. The `API docs`_.

 .. _`Introductory white paper`: _static/corda-introductory-whitepaper.pdf
 .. _`Technical white paper`: _static/corda-technical-whitepaper.pdf
@ -69,6 +72,7 @@ Read on to learn:
   :maxdepth: 2
   :caption: Appendix

+   loadtesting
   secure-coding-guidelines
   release-process
   release-notes
--- a/docs/build/html/_sources/initialmarginagreement.txt
+++ b/docs/build/html/_sources/initialmarginagreement.txt
@ -69,5 +69,5 @@ Run via CLI::
    1. Navigate to the `cordapp-samples` directory in your shell
    2. Run the gradle target `deployNodes` (ie; ./gradlew deployNodes for Unix or gradlew.bat on Windows)
        1. Unix: `cd simm-valuation-demo/build/nodes && ./runnodes`.
-        2. Windows: Open a command line window in each subdirectory of `simm-valuation-demo/build/nodes` and run `java -jar corda.jar`
+        2. Windows: `cd simm-valuation-demo/build/nodes & runnodes.bat`
    4. Browse to http://localhost:10005/web/simmvaluationdemo
--- a/docs/build/html/_sources/loadtesting.txt
+++ b/docs/build/html/_sources/loadtesting.txt
@ -0,0 +1,114 @@
+Load testing
+============
+
+This section explains how to apply random load to nodes to stress test them. It also allows the specification of disruptions that strain different resources, allowing us to inspect the nodes' behaviour under extreme conditions.
+
+The load-testing framework is incomplete and is not part of CI currently, but the basic pieces are there.
+
+Configuration of the load testing cluster
+-----------------------------------------
+
+The load-testing framework currently assumes the following about the node cluster:
+
+* The nodes are managed as a systemd service
+* The node directories are the same across the cluster
+* The messaging ports are the same across the cluster
+* The executing identity of the load-test has SSH access to all machines
+* There is a single network map service node
+* There is a single notary node
+* Some disruptions also assume other tools (like openssl) to be present
+
+Note that these points could and should be relaxed as needed.
+
+The load test Main expects a single command line argument that points to a configuration file specifying the cluster hosts and optional overrides for the default configuration:
+
+.. literalinclude:: ../../tools/loadtest/src/main/resources/loadtest-reference.conf
+
+Running the load tests
+----------------------
+
+In order to run the loadtests you need to have an active SSH-agent running with a single identity added that has SSH access to the loadtest cluster.
+
+You can use either IntelliJ or the gradle command line to start the tests.
+
+To use gradle: ``./gradlew tools:loadtest:run -Ploadtest-config=PATH_TO_LOADTEST_CONF``
+
+To use IntelliJ simply run Main.kt with the config path supplied as an argument.
+
+Configuration of individual load tests
+--------------------------------------
+
+The load testing configurations are not set-in-stone and are meant to be played with to see how the nodes react.
+
+There are a couple of top-level knobs to tweak test behaviour:
+
+.. literalinclude:: ../../tools/loadtest/src/main/kotlin/net/corda/loadtest/LoadTest.kt
+    :language: kotlin
+    :start-after: DOCS START 2
+    :end-before: DOCS END 2
+
+The one thing of note is ``disruptionPatterns``, which may be used to specify ways of disrupting the normal running of the load tests.
+
+.. literalinclude:: ../../tools/loadtest/src/main/kotlin/net/corda/loadtest/Disruption.kt
+    :language: kotlin
+    :start-after: DOCS START 1
+    :end-before: DOCS END 1
+
+Disruptions run concurrently in loops on randomly chosen nodes filtered by ``nodeFilter`` at somewhat random intervals.
+
+As an example take ``strainCpu`` which overutilises the processor:
+
+.. literalinclude:: ../../tools/loadtest/src/main/kotlin/net/corda/loadtest/Disruption.kt
+    :language: kotlin
+    :start-after: DOCS START 2
+    :end-before: DOCS END 2
+
+We can use this by specifying a ``DisruptionSpec`` in the load test's ``RunParameters``:
+
+.. literalinclude:: ../../tools/loadtest/src/main/kotlin/net/corda/loadtest/Main.kt
+    :language: kotlin
+    :start-after: DOCS START 1
+    :end-before: DOCS END 1
+    :dedent: 30
+
+This means every 5-10 seconds at least one randomly chosen nodes' cores will be spinning 100% for 10 seconds.
+
+How to write a load test
+------------------------
+
+A load test is basically defined by a random datastructure generator that specifies a unit of work a node should perform, a function that performs this work, and a function that predicts what state the node should end up in by doing so:
+
+.. literalinclude:: ../../tools/loadtest/src/main/kotlin/net/corda/loadtest/LoadTest.kt
+    :language: kotlin
+    :start-after: DOCS START 1
+    :end-before: DOCS END 1
+
+``LoadTest`` is parameterised over ``T``, the unit of work, and ``S``, the state type that aims to track remote node states. As an example let's look at the Self Issue test. This test simply creates Cash Issues from nodes to themselves, and then checks the vault to see if the numbers add up:
+
+.. literalinclude:: ../../tools/loadtest/src/main/kotlin/net/corda/loadtest/tests/SelfIssueTest.kt
+    :language: kotlin
+    :start-after: DOCS START 1
+    :end-before: DOCS END 1
+
+The unit of work ``SelfIssueCommand`` simply holds an Issue and a handle to a node where the issue should be submitted. The ``generate`` method should provide a generator for these.
+
+The state ``SelfIssueState`` then holds a map from node identities to a Long that describes the sum quantity of the generated issues (we fixed the currency to be USD).
+
+The invariant we want to hold then simply is: The sum of submitted Issues should be the sum of the quantities in the vaults.
+
+The ``interpret`` function should take a ``SelfIssueCommand`` and update ``SelfIssueState`` to reflect the change we're expecting in the remote nodes. In our case this will simply be adding the issued amount to the corresponding node's Long.
+
+The ``execute`` function should perform the action on the cluster. In our case it will simply take the node handle and submit an RPC request for the Issue.
+
+The ``gatherRemoteState`` function should check the actual remote nodes' states and see whether they conflict with our local predictions (and should throw if they do). This function deserves its own paragraph.
+
+.. literalinclude:: ../../tools/loadtest/src/main/kotlin/net/corda/loadtest/LoadTest.kt
+    :language: kotlin
+    :start-after: val execute
+    :end-before: val isConsistent
+
+``gatherRemoteState`` gets as input handles to all the nodes, and the current predicted state, or null if this is the initial gathering.
+
+The reason it gets the previous state boils down to allowing non-deterministic predictions about the nodes' remote states. Say some piece of work triggers an asynchronous notification of a node. We need to account both for the case when the node hasn't received the notification and for the case when it has. In these cases ``S`` should somehow represent a collection of possible states, and ``gatherRemoteState`` should "collapse" the collection based on the observations it makes. Of course we don't need this for the simple case of the Self Issue test.
+
+The last parameter ``isConsistent`` is used to poll for eventual consistency at the end of a load test. This is not needed for Self Issue.
--- a/docs/build/html/_sources/network-simulator.txt
+++ b/docs/build/html/_sources/network-simulator.txt
@ -7,11 +7,15 @@ map service and are notified of the changes to the map. The network simulator is

 **Windows**::

-    gradlew.bat network-simulator:run
+    gradlew.bat :samples:network-visualiser:run

 **Other**::

-    ./gradlew network-simulator:run
+    ./gradlew :samples:network-visualiser:run
+
+You can produce a standalone JAR of the tool by using the ``:samples:network-visualiser:deployVisualiser`` target
+and then using the ``samples/network-visualiser/build/libs/network-visualiser-*-capsule.jar`` file, where * is
+whatever the current Corda version is.

 Interface
 ---------
--- a/docs/build/html/_sources/running-the-demos.txt
+++ b/docs/build/html/_sources/running-the-demos.txt
@ -13,13 +13,29 @@ so far. We have:
 5. The SIMM valuation demo, a large demo which shows two nodes agreeing on a portfolio and valuing the initial margin
   using the Standard Initial Margin Model.

-.. note:: The demos currently must be run from IntelliJ, this will change before M6.
-
 .. note:: If any demos don't work please jump on our mailing list and let us know.

+The demos can be run either from the command line, or from inside IntelliJ. Running from the command line is
+recommended if you are just wanting to see them run, using IntelliJ can be helpful if you want to debug or
+develop the demos themselves.
+
 Trader demo
 -----------

+This demo brings up three nodes: Bank A, Bank B and a notary/network map node that they both use. Bank A will
+be the buyer, and self-issues some cash in order to acquire the commercial paper from Bank B, the seller.
+
+To run from the command line:
+
+1. Run ``./gradlew samples:trader-demo:deployNodes`` to create a set of configs and installs under ``samples/trader-demo/build/nodes``
+2. Run ``./samples/trader-demo/build/nodes/runnodes`` (or ``runnodes.bat`` on Windows) to open up three new terminals with the three nodes.
+3. Run ``./gradlew samples:trader-demo:runBuyer`` to set up the buyer node with some self-issued cash. This step
+   is not expected to print much.
+4. Run ``./gradlew samples:trader-demo:runSeller`` to trigger the transaction. You can see both sides of the
+   trade print their progress and final transaction state in the bank node tabs/windows.
+
+To run from IntelliJ:
+
 1. Open the Corda project in IntelliJ and run the "Install" configuration
 2. Open the Corda samples project in IntelliJ and run the "Trader Demo: Run Nodes" configuration
 3. Run "Trader Demo: Run Buyer"
@ -31,6 +47,24 @@ In the "Trader Demo: Run Nodes" windows you should see some log lines scroll pas
 IRS demo
 --------

+This demo brings up three nodes: Bank A, Bank B and a node that runs a notary, a network map and an interest rates
+oracle together. The two banks agree on an interest rate swap, and then do regular fixings of the deal as the time
+on a simulated clock passes.
+
+To run from the command line:
+
+1. Run ``./gradlew samples:irs-demo:deployNodes samples:irs-demo:installDist`` to install configs and a command line tool under ``samples/irs-demo/build``.
+2. Change to the ``samples/irs-demo/build`` directory.
+3. Run ``./nodes/runnodes`` (or ``runnodes.bat`` on Windows) to open up three new terminals with the three nodes.
+4. Run ``./install/irs-demo/bin/irs-demo --role UploadRates`` (or use ``irs-demo.bat`` on Windows). You should see a
+   message be printed to the first node (the notary/oracle/network map node) saying that it has accepted some new
+   interest rates.
+5. Now run ``irs-demo`` as in step 4, but this time with ``--role Trade 1``. The number is a trade ID. You should
+   see lots of activity as the nodes set up the deal, notarise it, get it signed by the oracle and so on.
+6. Now run ``irs-demo --role Date 2016-12-12`` to roll the simulated clock forward and see some fixings take place.
+
+To run from IntelliJ:
+
 1. Open the Corda project in IntelliJ and run the "Install" configuration
 2. Open the Corda samples project in IntelliJ and run the "IRS Demo: Run Nodes" configuration
 3. Run "IRS Demo: Run Upload Rates" to upload rates to the oracle.
@ -40,11 +74,8 @@ IRS demo
 In the "IRS Demo: Run Nodes" window you'll see a lot of activity when you run the trade and when you run the date change.
 The date change rolls the clock forwards and causes the nodes to agree on the fixings over a period.

-IRS web demo
------------
-
-There is also an IRS web demo installed. To use this follow steps 1-3 in the IRS demo and then navigate to
-http://localhost:10005/web/irsdemo and http://localhost:10005/web/irsdemo to see both node's view of the trades.
+There is also an web app as part of this demo. To use this set up the trades and then navigate to
+http://localhost:10005/web/irsdemo and http://localhost:10005/web/irsdemo to see both node's view of the ledger.

 To use the demos click the "Create Deal" button, fill in the form, then click the "Submit" button. Now you will be
 able to use the time controls at the top left of the home page to run the fixings. Click any individual trade in the
@ -53,6 +84,17 @@ blotter to view it.
 Attachment demo
 ---------------

+This demo brings up three nodes, and sends a transaction containing an attachment from one to the other. To run
+it from the command line (recommended for Mac/UNIX users!):
+
+1. Run ``./gradlew samples:attachment-demo:deployNodes`` to create a set of configs and installs under ``samples/trader-demo/build/nodes``
+2. Run ``./samples/attachment-demo/build/nodes/runnodes`` to open up three new terminal tabs/windows with the three nodes.
+3. Run ``./gradlew samples:attachment-demo:runRecipient``, which will block waiting for something to happen.
+4. Run ``./gradlew samples:attachment-demo:runSender`` in another terminal window to trigger the transaction.
+   Now look at the other windows to see the output of the demo.
+
+Or you can run them from inside IntelliJ, but when done this way, all the node output is printed to a single console.
+
 1. Open the Corda project in IntelliJ and run the "Install" configuration
 2. Open the Corda samples project in IntelliJ and run the "Attachment Demo: Run Nodes" configuration
 3. Run "Attachment Demo: Run Recipient" - this waits for a trade to start
--- a/docs/build/html/_sources/tutorial-clientrpc-api.txt
+++ b/docs/build/html/_sources/tutorial-clientrpc-api.txt
@ -1,31 +1,33 @@
 .. _graphstream: http://graphstream-project.org/

-Client RPC API
-==============
+Client RPC API Tutorial
+=======================

-In this tutorial we will build a simple command line utility that connects to a node and dumps the transaction graph to
-the standard output. We will then put some simple visualisation on top. For an explanation on how the RPC works see
-:doc:`clientrpc`.
+In this tutorial we will build a simple command line utility that
+connects to a node, creates some Cash transactions and meanwhile dumps
+the transaction graph to the standard output. We will then put some
+simple visualisation on top. For an explanation on how the RPC works
+see :doc:`clientrpc`.

-We start off by connecting to the node itself. For the purposes of the tutorial we will run the Trader demo on some
-local port and connect to the Buyer side. We will pass in the address as a command line argument. To connect to the node
-we also need to access the certificates of the node, we will access the node's ``certificates`` directory directly.
+We start off by connecting to the node itself. For the purposes of the tutorial we will use the Driver to start up a notary and a node that issues/exits and moves Cash around for herself. To authenticate we will use the certificates of the nodes directly.

-.. literalinclude:: example-code/src/main/kotlin/net.corda.docs/ClientRpcTutorial.kt
+Note how we configure the node to create a user that has permission to start the CashProtocol.
+
+.. literalinclude:: example-code/src/main/kotlin/net/corda/docs/ClientRpcTutorial.kt
    :language: kotlin
    :start-after: START 1
    :end-before: END 1

-Now we can connect to the node itself using a valid RPC login. By default the user `user1` is available with password `test`.
+Now we can connect to the node itself using a valid RPC login. We login using the configured user.

-.. literalinclude:: example-code/src/main/kotlin/net.corda.docs/ClientRpcTutorial.kt
+.. literalinclude:: example-code/src/main/kotlin/net/corda/docs/ClientRpcTutorial.kt
    :language: kotlin
    :start-after: START 2
    :end-before: END 2

-``proxy`` now exposes the full RPC interface of the node:
+We start generating transactions in a different thread (``generateTransactions`` to be defined later) using ``proxy``, which exposes the full RPC interface of the node:

-.. literalinclude:: ../../node/src/main/kotlin/net.corda.node/services/messaging/CordaRPCOps.kt
+.. literalinclude:: ../../node/src/main/kotlin/net/corda/node/services/messaging/CordaRPCOps.kt
    :language: kotlin
    :start-after: interface CordaRPCOps
    :end-before: }
@ -34,7 +36,7 @@ The one we need in order to dump the transaction graph is ``verifiedTransactions
 RPC will return a list of transactions and an Observable stream. This is a general pattern, we query some data and the
 node will return the current snapshot and future updates done to it.

-.. literalinclude:: example-code/src/main/kotlin/net.corda.docs/ClientRpcTutorial.kt
+.. literalinclude:: example-code/src/main/kotlin/net/corda/docs/ClientRpcTutorial.kt
    :language: kotlin
    :start-after: START 3
    :end-before: END 3
@ -43,41 +45,37 @@ The graph will be defined by nodes and edges between them. Each node represents
 output-input relations. For now let's just print ``NODE <txhash>`` for the former and ``EDGE <txhash> <txhash>`` for the
 latter.

-.. literalinclude:: example-code/src/main/kotlin/net.corda.docs/ClientRpcTutorial.kt
+.. literalinclude:: example-code/src/main/kotlin/net/corda/docs/ClientRpcTutorial.kt
    :language: kotlin
    :start-after: START 4
    :end-before: END 4

-Now we can start the trader demo as per described in :doc:`running-the-demos`::

-    # Build the demo
-    ./gradlew installDist
-    # Start the buyer
-    ./build/install/r3prototyping/bin/trader-demo --role=BUYER
+Now we just need to create the transactions themselves!

-In another terminal we can connect to it with our client::
+.. literalinclude:: example-code/src/main/kotlin/net/corda/docs/ClientRpcTutorial.kt
+    :language: kotlin
+    :start-after: START 6
+    :end-before: END 6

-    # Connect to localhost:31337
-    ./docs/source/example-code/build/install/docs/source/example-code/bin/client-rpc-tutorial localhost:31337 Print
+We utilise several RPC functions here to query things like the notaries in the node cluster or our own vault.

-We should see some ``NODE``-s printed. This is because the buyer self-issues some cash for the demo.
-Unless we ran the seller before we shouldn't see any ``EDGE``-s because the cash hasn't been spent yet.
+Then in a loop we generate randomly either an Issue, a Pay or an Exit transaction.

-In another terminal we can now start the seller::
+The RPC we need to initiate a Cash transaction is ``startProtocolDynamic`` which may start an arbitrary protocol, given sufficient permissions to do so. We won't use this function directly, but rather a type-safe wrapper around it ``startProtocol`` that type-checks the arguments for us.

-    # Start sellers in a loop
-    for i in {0..9} ; do ./build/install/r3prototyping/bin/trader-demo --role=SELLER ; done
+Finally we have everything in place: we start a couple of nodes, connect to them, and start creating transactions while listening on successfully created ones, which are dumped to the console. We just need to run it!:

-We should start seeing new ``NODE``-s and ``EDGE``-s appearing.
+    # Build the example
+    ./gradlew docs/source/example-code:installDist
+    # Start it
+    ./docs/source/example-code/build/install/docs/source/example-code/bin/client-rpc-tutorial Print

 Now let's try to visualise the transaction graph. We will use a graph drawing library called graphstream_

-.. literalinclude:: example-code/src/main/kotlin/net.corda.docs/ClientRpcTutorial.kt
+.. literalinclude:: example-code/src/main/kotlin/net/corda/docs/ClientRpcTutorial.kt
    :language: kotlin
    :start-after: START 5
    :end-before: END 5

-If we run the client with ``Visualise`` we should see a simple graph being drawn as new transactions are being created
-by the seller runs.
-
-That's it! We saw how to connect to the node and stream data from it.
+If we run the client with ``Visualise`` we should see a simple random graph being drawn as new transactions are being created.
--- a/docs/build/html/_static/corda-technical-whitepaper.pdf
+++ b/docs/build/html/_static/corda-technical-whitepaper.pdf
--- a/docs/build/html/_static/css/custom.css
+++ b/docs/build/html/_static/css/custom.css
@ -1,35 +1,161 @@
@import "theme.css";
+/* Highlights */

-.highlight .k, .highlight .kd {
-    color: blue;
+.highlight .k,
+.highlight .kd {
+      color: #263673;
 }

-.codesnippet-widgets {
-    min-width: 100%;
-    display: block;
-    background: lightskyblue;
-    color: white;
-    padding: 10px 0;
-    margin: 0 0 -1px 0;
-}
-
-.codesnippet-widgets > span {
-    padding: 10px;
-    cursor: pointer;
-}
-
-.codesnippet-widgets > .current {
-    background: deepskyblue;
-}
-
-.codeset > .highlight-java {
-    display: none;
-}
-
-.wy-nav-content {
-    max-width: 1000px;
+ /* Text */
+body,
+h1,
+h2,
+.rst-content .toctree-wrapper p.caption,
+h3,
+h4,
+h5,
+h6,
+legend,
+input{
+      color:#010101;
+      letter-spacing:0.3px
 }

 p {
-    font-size: 100%; /* Get rid of RTD rule that assumes nobody changes their browser font size */
-}
+        font-size: 100%; /* Get rid of RTD rule that assumes nobody changes their browser font size */
+}
+
+ /* Links */
+a{
+      color: #263673
+}
+a:hover{
+       color: #005CAB
+}
+a:visited{
+       color:#ADAFB3
+}
+
+ /* Side navigation bar */
+
+.wy-side-nav-search{
+	background-color:#010101;
+
+}
+
+.wy-side-nav-search a.icon-home{
+        color:transparent;
+        background-image:url('../images/fg002_corda_w3.png');
+	background-repeat:no-repeat;
+	background-size: Auto 20px;
+	background-position:center top;
+	background-origin:content box;
+	height:20px;
+	width:100%
+
+}
+
+.wy-side-nav-search input[type=text]{
+	border-radius:5px
+}
+
+.wy-menu-vertical a:hover{
+        background-color: #ADAFB3;
+        color:#FFF
+}
+
+.wy-nav-content{
+	background-color:#fff
+        max-width: 1000px;
+}
+
+.wy-nav-side{
+	background:#010101
+}
+ /* Navigation headers */
+.rst-content tt.literal, .rst-content tt.literal, .rst-content code.literal
+{
+	color:#EC1D24;
+	text-transform:none;
+}
+
+
+.wy-menu-vertical header, .wy-menu-vertical p.caption
+{
+	font-size:1.1em;
+	color:#EC1D24;
+	text-transform:none;
+	background-color: #3C3C3E;
+	padding: 0 0.5em;
+	margin-top: 0.5em;
+}
+
+ /* Code snippets */
+
+.codesnippet-widgets {
+        min-width: 100%;
+        display: block;
+        background: #005CAB;
+        color: white;
+        padding: 10px 0;
+        margin: 0 0 -1px 0;
+}
+
+.codesnippet-widgets > span {
+        padding: 10px;
+        cursor: pointer;
+}
+
+.codesnippet-widgets > .current {
+        background: #263673;
+}
+
+.codeset > .highlight-java {
+        display: none;
+}
+
+
+/* Notification boxes */
+.wy-alert.wy-alert-warning .wy-alert-title,
+.rst-content .wy-alert-warning.note .wy-alert-title,
+.rst-content .attention .wy-alert-title,
+.rst-content .caution .wy-alert-title,
+.rst-content .wy-alert-warning.danger .wy-alert-title,
+.rst-content .wy-alert-warning.error .wy-alert-title,
+.rst-content .wy-alert-warning.hint .wy-alert-title,
+.rst-content .wy-alert-warning.important .wy-alert-title,
+.rst-content .wy-alert-warning.tip .wy-alert-title,
+.rst-content .warning .wy-alert-title,
+.rst-content .wy-alert-warning.seealso .wy-alert-title,
+.rst-content .admonition-todo .wy-alert-title,
+.wy-alert.wy-alert-warning .rst-content .admonition-title,
+.rst-content .wy-alert.wy-alert-warning .admonition-title,
+.rst-content .wy-alert-warning.note .admonition-title,
+.rst-content .attention .admonition-title,
+.rst-content .caution .admonition-title, .rst-content
+.wy-alert-warning.danger .admonition-title,
+.rst-content .wy-alert-warning.error .admonition-title,
+.rst-content .wy-alert-warning.hint .admonition-title,
+.rst-content .wy-alert-warning.important .admonition-title,
+.rst-content .wy-alert-warning.tip .admonition-title,
+.rst-content .warning .admonition-title,
+.rst-content .wy-alert-warning.seealso .admonition-title,
+.rst-content .admonition-todo .admonition-title{
+        background-color: #263673
+}
+
+.wy-alert,
+.rst-content .note,
+.rst-content .attention,
+.rst-content .caution,
+.rst-content .danger,
+.rst-content .error,
+.rst-content .hint,
+.rst-content .important,
+.rst-content .tip,
+.rst-content .warning,
+.rst-content .seealso,
+.rst-content .admonition-todo{
+        background-color:#d9e5ef
+}
+
--- a/docs/build/html/_static/images/fg002_corda_w3.png
+++ b/docs/build/html/_static/images/fg002_corda_w3.png
--- a/docs/build/html/api/alltypes/index.html
+++ b/docs/build/html/api/alltypes/index.html
@ -338,6 +338,26 @@ the same transaction.</p>
 </tr>
 <tr>
 <td>
+<a href="../net.corda.protocols/-cash-command/index.html">net.corda.protocols.CashCommand</a></td>
+<td>
+<p>A command to initiate the Cash protocol with.</p>
+</td>
+</tr>
+<tr>
+<td>
+<a href="../net.corda.protocols/-cash-protocol/index.html">net.corda.protocols.CashProtocol</a></td>
+<td>
+<p>Initiates a protocol that produces an Issue/Move or Exit Cash transaction.</p>
+</td>
+</tr>
+<tr>
+<td>
+<a href="../net.corda.protocols/-cash-protocol-result/index.html">net.corda.protocols.CashProtocolResult</a></td>
+<td>
+</td>
+</tr>
+<tr>
+<td>
 <a href="../net.corda.schemas/-cash-schema.html">net.corda.schemas.CashSchema</a></td>
 <td>
 <p>An object used to fully qualify the <a href="../net.corda.schemas/-cash-schema.html">CashSchema</a> family name (i.e. independent of version).</p>
@ -412,13 +432,6 @@ provided directly by this clause.</p>
 </tr>
 <tr>
 <td>
-<a href="../net.corda.core.contracts/-client-to-service-command/index.html">net.corda.core.contracts.ClientToServiceCommand</a></td>
-<td>
-<p>A command from the monitoring client, to the node.</p>
-</td>
-</tr>
-<tr>
-<td>
 <a href="../net.corda.node.utilities/java.time.-clock/index.html">java.time.Clock</a> (extensions in package net.corda.node.utilities)</td>
 <td>
 </td>
@ -619,7 +632,7 @@ useful tasks. See the documentation for <a href="../net.corda.client/-corda-r-p-
 <a href="../net.corda.node.services.messaging/-corda-r-p-c-ops/index.html">net.corda.node.services.messaging.CordaRPCOps</a></td>
 <td>
 <p>RPC operations that the node exposes to clients using the Java client library. These can be called from
-client apps and are implemented by the node in the <a href="#">ServerRPCOps</a> class.</p>
+client apps and are implemented by the node in the <a href="#">CordaRPCOpsImpl</a> class.</p>
 </td>
 </tr>
 <tr>
@ -1132,6 +1145,12 @@ set via the constructor and the class is immutable.</p>
 </tr>
 <tr>
 <td>
+<a href="../net.corda.protocols/-input-state-ref-resolve-failed/index.html">net.corda.protocols.InputStateRefResolveFailed</a></td>
+<td>
+</td>
+</tr>
+<tr>
+<td>
 <a href="../net.corda.core/java.io.-input-stream/index.html">java.io.InputStream</a> (extensions in package net.corda.core)</td>
 <td>
 </td>
@ -1890,7 +1909,10 @@ because of permissioning)</p>
 <td>
 <a href="../net.corda.core.crypto/-party/index.html">net.corda.core.crypto.Party</a></td>
 <td>
-<p>A <a href="../net.corda.core.crypto/-party/index.html">Party</a> is well known (name, pubkey) pair. In a real system this would probably be an X.509 certificate.</p>
+<p>The <a href="../net.corda.core.crypto/-party/index.html">Party</a> class represents an entity on the network, which is typically identified by a legal <a href="../net.corda.core.crypto/-party/name.html">name</a> and public key
+that it can sign transactions under. As parties may use multiple keys for signing and, for example, have offline backup
+keys, the "public key" of a party is represented by a composite construct – a <a href="../net.corda.core.crypto/-public-key-tree/index.html">PublicKeyTree</a>, which combines multiple
+cryptographic public key primitives into a tree structure.</p>
 </td>
 </tr>
 <tr>
@ -2031,13 +2053,13 @@ a singleton).</p>
 </tr>
 <tr>
 <td>
-<a href="../net.corda.node.services/-properties-file-r-p-c-user-service/index.html">net.corda.node.services.PropertiesFileRPCUserService</a></td>
+<a href="../net.corda.node.api/-protocol-class-ref/index.html">net.corda.node.api.ProtocolClassRef</a></td>
 <td>
 </td>
 </tr>
 <tr>
 <td>
-<a href="../net.corda.node.api/-protocol-class-ref/index.html">net.corda.node.api.ProtocolClassRef</a></td>
+<a href="../net.corda.node.services.messaging/-protocol-handle/index.html">net.corda.node.services.messaging.ProtocolHandle</a></td>
 <td>
 </td>
 </tr>
@ -2144,6 +2166,19 @@ For any given flow there is only one PSM, even if that protocol invokes subproto
 </tr>
 <tr>
 <td>
+<a href="../net.corda.node.utilities/-public-key-tree-column-type/index.html">net.corda.node.utilities.PublicKeyTreeColumnType</a></td>
+<td>
+<p><a href="#">ColumnType</a> for marshalling to/from database on behalf of <a href="../net.corda.core.crypto/-public-key-tree/index.html">PublicKeyTree</a>.</p>
+</td>
+</tr>
+<tr>
+<td>
+<a href="../net.corda.core.testing/-public-key-tree-generator/index.html">net.corda.core.testing.PublicKeyTreeGenerator</a></td>
+<td>
+</td>
+</tr>
+<tr>
+<td>
 <a href="../net.corda.core.schemas/-queryable-state/index.html">net.corda.core.schemas.QueryableState</a></td>
 <td>
 <p>A contract state that may be mapped to database schemas configured for this node to support querying for,
@ -2203,6 +2238,12 @@ to. These permissions are represented as <a href="#">String</a>s to allow RPC im
 </tr>
 <tr>
 <td>
+<a href="../net.corda.node.services/-r-p-c-user-service-impl/index.html">net.corda.node.services.RPCUserServiceImpl</a></td>
+<td>
+</td>
+</tr>
+<tr>
+<td>
 <a href="../net.corda.client.fxutils/-read-only-backed-observable-map-base/index.html">net.corda.client.fxutils.ReadOnlyBackedObservableMapBase</a></td>
 <td>
 <p><a href="../net.corda.client.fxutils/-read-only-backed-observable-map-base/index.html">ReadOnlyBackedObservableMapBase</a> is a base class implementing all abstract functions required for an <a href="#">ObservableMap</a>
@ -2753,12 +2794,6 @@ between (after, before).</p>
 </tr>
 <tr>
 <td>
-<a href="../net.corda.node.services.messaging/-transaction-build-result/index.html">net.corda.node.services.messaging.TransactionBuildResult</a></td>
-<td>
-</td>
-</tr>
-<tr>
-<td>
 <a href="../net.corda.node.api/-transaction-build-step/index.html">net.corda.node.api.TransactionBuildStep</a></td>
 <td>
 <p>Encapsulate a generateXXX method call on a contract.</p>
@ -2874,6 +2909,12 @@ and seller) and the following steps:</p>
 </tr>
 <tr>
 <td>
+<a href="../net.corda.node.utilities/-txn-note-columns/index.html">net.corda.node.utilities.TxnNoteColumns</a></td>
+<td>
+</td>
+</tr>
+<tr>
+<td>
 <a href="../net.corda.core.contracts/-type-only-command-data/index.html">net.corda.core.contracts.TypeOnlyCommandData</a></td>
 <td>
 <p>Commands that inherit from this are intended to have no data items: its only their presence that matters.</p>
--- a/docs/build/html/api/index-outline.html
+++ b/docs/build/html/api/index-outline.html
--- a/docs/build/html/api/net.corda.client.fxutils/-aggregated-list/index.html
+++ b/docs/build/html/api/net.corda.client.fxutils/-aggregated-list/index.html
@ -210,6 +210,20 @@ or throws if more than one element was found.</p>
 <code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span> <span class="identifier">Iterable</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">noneOrSingle</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">T</span><span class="symbol">?</span></code><p>Returns single element, or <code>null</code> if element was not found, or throws if more than one element was found.</p>
 </td>
 </tr>
+<tr>
+<td>
+<a href="../../net.corda.core/kotlin.collections.-list/random-or-null.html">randomOrNull</a></td>
+<td>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span> <span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">randomOrNull</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">T</span><span class="symbol">?</span></code><p>Returns a random element in the list, or null if empty</p>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span> <span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">randomOrNull</span><span class="symbol">(</span><span class="identifier" id="net.corda.core$randomOrNull(kotlin.collections.List((net.corda.core.randomOrNull.T)), kotlin.Function1((net.corda.core.randomOrNull.T, kotlin.Boolean)))/predicate">predicate</span><span class="symbol">:</span>&nbsp;<span class="symbol">(</span><span class="identifier">T</span><span class="symbol">)</span>&nbsp;<span class="symbol">-&gt;</span>&nbsp;<span class="identifier">Boolean</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code><p>Returns a random element in the list matching the given predicate, or null if none found</p>
+</td>
+</tr>
+<tr>
+<td>
+<a href="../javafx.collections.-observable-list/unique.html">unique</a></td>
+<td>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">ObservableList</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">unique</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">ObservableList</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code></td>
+</tr>
 </tbody>
 </table>
 </BODY>
--- a/docs/build/html/api/net.corda.client.fxutils/-chosen-list/index.html
+++ b/docs/build/html/api/net.corda.client.fxutils/-chosen-list/index.html
@ -167,6 +167,20 @@ or throws if more than one element was found.</p>
 <code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span> <span class="identifier">Iterable</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">noneOrSingle</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">T</span><span class="symbol">?</span></code><p>Returns single element, or <code>null</code> if element was not found, or throws if more than one element was found.</p>
 </td>
 </tr>
+<tr>
+<td>
+<a href="../../net.corda.core/kotlin.collections.-list/random-or-null.html">randomOrNull</a></td>
+<td>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span> <span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">randomOrNull</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">T</span><span class="symbol">?</span></code><p>Returns a random element in the list, or null if empty</p>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span> <span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">randomOrNull</span><span class="symbol">(</span><span class="identifier" id="net.corda.core$randomOrNull(kotlin.collections.List((net.corda.core.randomOrNull.T)), kotlin.Function1((net.corda.core.randomOrNull.T, kotlin.Boolean)))/predicate">predicate</span><span class="symbol">:</span>&nbsp;<span class="symbol">(</span><span class="identifier">T</span><span class="symbol">)</span>&nbsp;<span class="symbol">-&gt;</span>&nbsp;<span class="identifier">Boolean</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code><p>Returns a random element in the list matching the given predicate, or null if none found</p>
+</td>
+</tr>
+<tr>
+<td>
+<a href="../javafx.collections.-observable-list/unique.html">unique</a></td>
+<td>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">ObservableList</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">unique</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">ObservableList</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code></td>
+</tr>
 </tbody>
 </table>
 </BODY>
--- a/docs/build/html/api/net.corda.client.fxutils/-concatenated-list/index.html
+++ b/docs/build/html/api/net.corda.client.fxutils/-concatenated-list/index.html
@ -169,6 +169,20 @@ or throws if more than one element was found.</p>
 <code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span> <span class="identifier">Iterable</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">noneOrSingle</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">T</span><span class="symbol">?</span></code><p>Returns single element, or <code>null</code> if element was not found, or throws if more than one element was found.</p>
 </td>
 </tr>
+<tr>
+<td>
+<a href="../../net.corda.core/kotlin.collections.-list/random-or-null.html">randomOrNull</a></td>
+<td>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span> <span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">randomOrNull</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">T</span><span class="symbol">?</span></code><p>Returns a random element in the list, or null if empty</p>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span> <span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">randomOrNull</span><span class="symbol">(</span><span class="identifier" id="net.corda.core$randomOrNull(kotlin.collections.List((net.corda.core.randomOrNull.T)), kotlin.Function1((net.corda.core.randomOrNull.T, kotlin.Boolean)))/predicate">predicate</span><span class="symbol">:</span>&nbsp;<span class="symbol">(</span><span class="identifier">T</span><span class="symbol">)</span>&nbsp;<span class="symbol">-&gt;</span>&nbsp;<span class="identifier">Boolean</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code><p>Returns a random element in the list matching the given predicate, or null if none found</p>
+</td>
+</tr>
+<tr>
+<td>
+<a href="../javafx.collections.-observable-list/unique.html">unique</a></td>
+<td>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">ObservableList</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">unique</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">ObservableList</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code></td>
+</tr>
 </tbody>
 </table>
 </BODY>
--- a/docs/build/html/api/net.corda.client.fxutils/-flattened-list/index.html
+++ b/docs/build/html/api/net.corda.client.fxutils/-flattened-list/index.html
@ -195,6 +195,20 @@ or throws if more than one element was found.</p>
 <code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span> <span class="identifier">Iterable</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">noneOrSingle</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">T</span><span class="symbol">?</span></code><p>Returns single element, or <code>null</code> if element was not found, or throws if more than one element was found.</p>
 </td>
 </tr>
+<tr>
+<td>
+<a href="../../net.corda.core/kotlin.collections.-list/random-or-null.html">randomOrNull</a></td>
+<td>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span> <span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">randomOrNull</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">T</span><span class="symbol">?</span></code><p>Returns a random element in the list, or null if empty</p>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span> <span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">randomOrNull</span><span class="symbol">(</span><span class="identifier" id="net.corda.core$randomOrNull(kotlin.collections.List((net.corda.core.randomOrNull.T)), kotlin.Function1((net.corda.core.randomOrNull.T, kotlin.Boolean)))/predicate">predicate</span><span class="symbol">:</span>&nbsp;<span class="symbol">(</span><span class="identifier">T</span><span class="symbol">)</span>&nbsp;<span class="symbol">-&gt;</span>&nbsp;<span class="identifier">Boolean</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code><p>Returns a random element in the list matching the given predicate, or null if none found</p>
+</td>
+</tr>
+<tr>
+<td>
+<a href="../javafx.collections.-observable-list/unique.html">unique</a></td>
+<td>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">ObservableList</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">unique</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">ObservableList</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code></td>
+</tr>
 </tbody>
 </table>
 </BODY>
--- a/docs/build/html/api/net.corda.client.fxutils/-map-values-list/index.html
+++ b/docs/build/html/api/net.corda.client.fxutils/-map-values-list/index.html
@ -145,6 +145,20 @@ or throws if more than one element was found.</p>
 <code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span> <span class="identifier">Iterable</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">noneOrSingle</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">T</span><span class="symbol">?</span></code><p>Returns single element, or <code>null</code> if element was not found, or throws if more than one element was found.</p>
 </td>
 </tr>
+<tr>
+<td>
+<a href="../../net.corda.core/kotlin.collections.-list/random-or-null.html">randomOrNull</a></td>
+<td>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span> <span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">randomOrNull</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">T</span><span class="symbol">?</span></code><p>Returns a random element in the list, or null if empty</p>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span> <span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">randomOrNull</span><span class="symbol">(</span><span class="identifier" id="net.corda.core$randomOrNull(kotlin.collections.List((net.corda.core.randomOrNull.T)), kotlin.Function1((net.corda.core.randomOrNull.T, kotlin.Boolean)))/predicate">predicate</span><span class="symbol">:</span>&nbsp;<span class="symbol">(</span><span class="identifier">T</span><span class="symbol">)</span>&nbsp;<span class="symbol">-&gt;</span>&nbsp;<span class="identifier">Boolean</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code><p>Returns a random element in the list matching the given predicate, or null if none found</p>
+</td>
+</tr>
+<tr>
+<td>
+<a href="../javafx.collections.-observable-list/unique.html">unique</a></td>
+<td>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">ObservableList</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">unique</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">ObservableList</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code></td>
+</tr>
 </tbody>
 </table>
 </BODY>
--- a/docs/build/html/api/net.corda.client.fxutils/-mapped-list/index.html
+++ b/docs/build/html/api/net.corda.client.fxutils/-mapped-list/index.html
@ -177,6 +177,20 @@ or throws if more than one element was found.</p>
 <code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span> <span class="identifier">Iterable</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">noneOrSingle</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">T</span><span class="symbol">?</span></code><p>Returns single element, or <code>null</code> if element was not found, or throws if more than one element was found.</p>
 </td>
 </tr>
+<tr>
+<td>
+<a href="../../net.corda.core/kotlin.collections.-list/random-or-null.html">randomOrNull</a></td>
+<td>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span> <span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">randomOrNull</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">T</span><span class="symbol">?</span></code><p>Returns a random element in the list, or null if empty</p>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span> <span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">randomOrNull</span><span class="symbol">(</span><span class="identifier" id="net.corda.core$randomOrNull(kotlin.collections.List((net.corda.core.randomOrNull.T)), kotlin.Function1((net.corda.core.randomOrNull.T, kotlin.Boolean)))/predicate">predicate</span><span class="symbol">:</span>&nbsp;<span class="symbol">(</span><span class="identifier">T</span><span class="symbol">)</span>&nbsp;<span class="symbol">-&gt;</span>&nbsp;<span class="identifier">Boolean</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code><p>Returns a random element in the list matching the given predicate, or null if none found</p>
+</td>
+</tr>
+<tr>
+<td>
+<a href="../javafx.collections.-observable-list/unique.html">unique</a></td>
+<td>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">ObservableList</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">unique</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">ObservableList</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code></td>
+</tr>
 </tbody>
 </table>
 </BODY>
--- a/docs/build/html/api/net.corda.client.fxutils/-replayed-list/index.html
+++ b/docs/build/html/api/net.corda.client.fxutils/-replayed-list/index.html
@ -175,6 +175,20 @@ or throws if more than one element was found.</p>
 <code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span> <span class="identifier">Iterable</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">noneOrSingle</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">T</span><span class="symbol">?</span></code><p>Returns single element, or <code>null</code> if element was not found, or throws if more than one element was found.</p>
 </td>
 </tr>
+<tr>
+<td>
+<a href="../../net.corda.core/kotlin.collections.-list/random-or-null.html">randomOrNull</a></td>
+<td>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span> <span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">randomOrNull</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">T</span><span class="symbol">?</span></code><p>Returns a random element in the list, or null if empty</p>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span> <span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">randomOrNull</span><span class="symbol">(</span><span class="identifier" id="net.corda.core$randomOrNull(kotlin.collections.List((net.corda.core.randomOrNull.T)), kotlin.Function1((net.corda.core.randomOrNull.T, kotlin.Boolean)))/predicate">predicate</span><span class="symbol">:</span>&nbsp;<span class="symbol">(</span><span class="identifier">T</span><span class="symbol">)</span>&nbsp;<span class="symbol">-&gt;</span>&nbsp;<span class="identifier">Boolean</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code><p>Returns a random element in the list matching the given predicate, or null if none found</p>
+</td>
+</tr>
+<tr>
+<td>
+<a href="../javafx.collections.-observable-list/unique.html">unique</a></td>
+<td>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">ObservableList</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">unique</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">ObservableList</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code></td>
+</tr>
 </tbody>
 </table>
 </BODY>
--- a/docs/build/html/api/net.corda.client.fxutils/javafx.collections.-observable-list/index.html
+++ b/docs/build/html/api/net.corda.client.fxutils/javafx.collections.-observable-list/index.html
@ -117,6 +117,12 @@ people.leftOuterJoin(animals, Person::favouriteSpecies, Animal::species)</p>
 val dogOwners: ObservableList = dogs.map { it.owner }</p>
 </td>
 </tr>
+<tr>
+<td>
+<a href="unique.html">unique</a></td>
+<td>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">ObservableList</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">unique</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">ObservableList</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code></td>
+</tr>
 </tbody>
 </table>
 </BODY>
--- a/docs/build/html/api/net.corda.client.fxutils/javafx.collections.-observable-list/unique.html
+++ b/docs/build/html/api/net.corda.client.fxutils/javafx.collections.-observable-list/unique.html
@ -0,0 +1,15 @@
+<HTML>
+<HEAD>
+<title>unique - </title>
+<link rel="stylesheet" href="../../style.css">
+</HEAD>
+<BODY>
+<a href="../index.html">net.corda.client.fxutils</a>&nbsp;/&nbsp;<a href="index.html">javafx.collections.ObservableList</a>&nbsp;/&nbsp;<a href=".">unique</a><br/>
+<br/>
+<h1>unique</h1>
+<a name="net.corda.client.fxutils$unique(javafx.collections.ObservableList((net.corda.client.fxutils.unique.T)))"></a>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">ObservableList</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">unique</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">ObservableList</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code><br/>
+<br/>
+<br/>
+</BODY>
+</HTML>
--- a/docs/build/html/api/net.corda.client.mock/-event-generator/index.html
+++ b/docs/build/html/api/net.corda.client.mock/-event-generator/index.html
@ -90,6 +90,12 @@ state/ref pairs, but it doesnt necessarily generate "correct" events</p>
 </tr>
 <tr>
 <td>
+<a href="issued-generator.html">issuedGenerator</a></td>
+<td>
+<code><span class="keyword">val </span><span class="identifier">issuedGenerator</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code></td>
+</tr>
+<tr>
+<td>
 <a href="issuer-generator.html">issuerGenerator</a></td>
 <td>
 <code><span class="keyword">val </span><span class="identifier">issuerGenerator</span><span class="symbol">: </span><a href="../-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-party-and-reference/index.html"><span class="identifier">PartyAndReference</span></a><span class="symbol">&gt;</span></code></td>
--- a/docs/build/html/api/net.corda.client.mock/-event-generator/issued-generator.html
+++ b/docs/build/html/api/net.corda.client.mock/-event-generator/issued-generator.html
@ -0,0 +1,15 @@
+<HTML>
+<HEAD>
+<title>EventGenerator.issuedGenerator - </title>
+<link rel="stylesheet" href="../../style.css">
+</HEAD>
+<BODY>
+<a href="../index.html">net.corda.client.mock</a>&nbsp;/&nbsp;<a href="index.html">EventGenerator</a>&nbsp;/&nbsp;<a href=".">issuedGenerator</a><br/>
+<br/>
+<h1>issuedGenerator</h1>
+<a name="net.corda.client.mock.EventGenerator$issuedGenerator"></a>
+<code><span class="keyword">val </span><span class="identifier">issuedGenerator</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code><br/>
+<br/>
+<br/>
+</BODY>
+</HTML>
--- a/docs/build/html/api/net.corda.client.mock/-generator/-init-.html
+++ b/docs/build/html/api/net.corda.client.mock/-generator/-init-.html
@ -7,7 +7,7 @@
 <a href="../index.html">net.corda.client.mock</a>&nbsp;/&nbsp;<a href="index.html">Generator</a>&nbsp;/&nbsp;<a href=".">&lt;init&gt;</a><br/>
 <br/>
 <h1>&lt;init&gt;</h1>
-<code><span class="identifier">Generator</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock.Generator$<init>(kotlin.Function1((java.util.Random, net.corda.core.ErrorOr((net.corda.client.mock.Generator.A)))))/generate">generate</span><span class="symbol">:</span>&nbsp;<span class="symbol">(</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Random.html"><span class="identifier">Random</span></a><span class="symbol">)</span>&nbsp;<span class="symbol">-&gt;</span>&nbsp;<a href="../../net.corda.core/-error-or/index.html"><span class="identifier">ErrorOr</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">)</span></code><br/>
+<code><span class="identifier">Generator</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock.Generator$<init>(kotlin.Function1((java.util.SplittableRandom, net.corda.core.ErrorOr((net.corda.client.mock.Generator.A)))))/generate">generate</span><span class="symbol">:</span>&nbsp;<span class="symbol">(</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/SplittableRandom.html"><span class="identifier">SplittableRandom</span></a><span class="symbol">)</span>&nbsp;<span class="symbol">-&gt;</span>&nbsp;<a href="../../net.corda.core/-error-or/index.html"><span class="identifier">ErrorOr</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">)</span></code><br/>
 <p>This file defines a basic <a href="index.html">Generator</a> library for composing random generators of objects.</p>
 <p>An object of type <a href="index.html">Generator</a>&lt;<a href="#">A</a>&gt; captures a generator of <a href="#">A</a>s. Generators may be composed in several ways.</p>
 <p><a href="choice.html">Generator.choice</a> picks a generator from the specified list and runs that.
@ -26,7 +26,7 @@ val animalsGenerator = Generator.frequency(
 0.2 to birdsGenerator,
 0.8 to mammalsGenerator
 )
-val animals = animalsGenerator.generate(Random()).getOrThrow()</p>
+val animals = animalsGenerator.generate(SplittableRandom()).getOrThrow()</p>
 <p>The above will generate a random list of animals.</p>
 <br/>
 <br/>
--- a/docs/build/html/api/net.corda.client.mock/-generator/bind.html
+++ b/docs/build/html/api/net.corda.client.mock/-generator/bind.html
@ -8,7 +8,7 @@
 <br/>
 <h1>bind</h1>
 <a name="net.corda.client.mock.Generator$bind(kotlin.Function1((net.corda.client.mock.Generator.A, net.corda.client.mock.Generator((net.corda.client.mock.Generator.bind.B)))))"></a>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">B</span><span class="symbol">&gt;</span> <span class="identifier">bind</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock.Generator$bind(kotlin.Function1((net.corda.client.mock.Generator.A, net.corda.client.mock.Generator((net.corda.client.mock.Generator.bind.B)))))/function">function</span><span class="symbol">:</span>&nbsp;<span class="symbol">(</span><span class="identifier">A</span><span class="symbol">)</span>&nbsp;<span class="symbol">-&gt;</span>&nbsp;<a href="index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">B</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">Nothing</span><span class="symbol">&gt;</span></code><br/>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">B</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">bind</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock.Generator$bind(kotlin.Function1((net.corda.client.mock.Generator.A, net.corda.client.mock.Generator((net.corda.client.mock.Generator.bind.B)))))/function">function</span><span class="symbol">:</span>&nbsp;<span class="symbol">(</span><span class="identifier">A</span><span class="symbol">)</span>&nbsp;<span class="symbol">-&gt;</span>&nbsp;<a href="index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">B</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">B</span><span class="symbol">&gt;</span></code><br/>
 <br/>
 <br/>
 </BODY>
--- a/docs/build/html/api/net.corda.client.mock/-generator/choice.html
+++ b/docs/build/html/api/net.corda.client.mock/-generator/choice.html
@ -8,7 +8,7 @@
 <br/>
 <h1>choice</h1>
 <a name="net.corda.client.mock.Generator.Companion$choice(kotlin.collections.List((net.corda.client.mock.Generator((net.corda.client.mock.Generator.Companion.choice.A)))))"></a>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span> <span class="identifier">choice</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock.Generator.Companion$choice(kotlin.collections.List((net.corda.client.mock.Generator((net.corda.client.mock.Generator.Companion.choice.A)))))/generators">generators</span><span class="symbol">:</span>&nbsp;<span class="identifier">List</span><span class="symbol">&lt;</span><a href="index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">Nothing</span><span class="symbol">&gt;</span></code><br/>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">choice</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock.Generator.Companion$choice(kotlin.collections.List((net.corda.client.mock.Generator((net.corda.client.mock.Generator.Companion.choice.A)))))/generators">generators</span><span class="symbol">:</span>&nbsp;<span class="identifier">List</span><span class="symbol">&lt;</span><a href="index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span></code><br/>
 <br/>
 <br/>
 </BODY>
--- a/docs/build/html/api/net.corda.client.mock/-generator/combine.html
+++ b/docs/build/html/api/net.corda.client.mock/-generator/combine.html
--- a/docs/build/html/api/net.corda.client.mock/-generator/fail.html
+++ b/docs/build/html/api/net.corda.client.mock/-generator/fail.html
@ -8,7 +8,7 @@
 <br/>
 <h1>fail</h1>
 <a name="net.corda.client.mock.Generator.Companion$fail(java.lang.Exception)"></a>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span> <span class="identifier">fail</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock.Generator.Companion$fail(java.lang.Exception)/error">error</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/lang/Exception.html"><span class="identifier">Exception</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span></code><br/>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">fail</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock.Generator.Companion$fail(java.lang.Exception)/error">error</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/lang/Exception.html"><span class="identifier">Exception</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span></code><br/>
 <br/>
 <br/>
 </BODY>
--- a/docs/build/html/api/net.corda.client.mock/-generator/frequency.html
+++ b/docs/build/html/api/net.corda.client.mock/-generator/frequency.html
@ -7,8 +7,8 @@
 <a href="../index.html">net.corda.client.mock</a>&nbsp;/&nbsp;<a href="index.html">Generator</a>&nbsp;/&nbsp;<a href=".">frequency</a><br/>
 <br/>
 <h1>frequency</h1>
-<a name="net.corda.client.mock.Generator.Companion$frequency(kotlin.Array((((kotlin.Double, net.corda.client.mock.Generator((net.corda.client.mock.Generator.Companion.frequency.A)))))))"></a>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span> <span class="identifier">frequency</span><span class="symbol">(</span><span class="keyword">vararg</span> <span class="identifier" id="net.corda.client.mock.Generator.Companion$frequency(kotlin.Array((((kotlin.Double, net.corda.client.mock.Generator((net.corda.client.mock.Generator.Companion.frequency.A)))))))/generators">generators</span><span class="symbol">:</span>&nbsp;<span class="identifier">&lt;ERROR CLASS&gt;</span><span class="symbol">&lt;</span><span class="identifier">Double</span><span class="symbol">,</span>&nbsp;<a href="index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span></code><br/>
+<a name="net.corda.client.mock.Generator.Companion$frequency(kotlin.collections.List((((kotlin.Double, net.corda.client.mock.Generator((net.corda.client.mock.Generator.Companion.frequency.A)))))))"></a>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">frequency</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock.Generator.Companion$frequency(kotlin.collections.List((((kotlin.Double, net.corda.client.mock.Generator((net.corda.client.mock.Generator.Companion.frequency.A)))))))/generators">generators</span><span class="symbol">:</span>&nbsp;<span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">&lt;ERROR CLASS&gt;</span><span class="symbol">&lt;</span><span class="identifier">Double</span><span class="symbol">,</span>&nbsp;<a href="index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span></code><br/>
 <br/>
 <br/>
 </BODY>
--- a/docs/build/html/api/net.corda.client.mock/-generator/generate.html
+++ b/docs/build/html/api/net.corda.client.mock/-generator/generate.html
@ -8,7 +8,7 @@
 <br/>
 <h1>generate</h1>
 <a name="net.corda.client.mock.Generator$generate"></a>
-<code><span class="keyword">val </span><span class="identifier">generate</span><span class="symbol">: </span><span class="symbol">(</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Random.html"><span class="identifier">Random</span></a><span class="symbol">)</span>&nbsp;<span class="symbol">-&gt;</span>&nbsp;<a href="../../net.corda.core/-error-or/index.html"><span class="identifier">ErrorOr</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span></code><br/>
+<code><span class="keyword">val </span><span class="identifier">generate</span><span class="symbol">: </span><span class="symbol">(</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/SplittableRandom.html"><span class="identifier">SplittableRandom</span></a><span class="symbol">)</span>&nbsp;<span class="symbol">-&gt;</span>&nbsp;<a href="../../net.corda.core/-error-or/index.html"><span class="identifier">ErrorOr</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span></code><br/>
 <br/>
 <br/>
 </BODY>
--- a/docs/build/html/api/net.corda.client.mock/-generator/impure.html
+++ b/docs/build/html/api/net.corda.client.mock/-generator/impure.html
@ -8,7 +8,7 @@
 <br/>
 <h1>impure</h1>
 <a name="net.corda.client.mock.Generator.Companion$impure(kotlin.Function0((net.corda.client.mock.Generator.Companion.impure.A)))"></a>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span> <span class="identifier">impure</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock.Generator.Companion$impure(kotlin.Function0((net.corda.client.mock.Generator.Companion.impure.A)))/valueClosure">valueClosure</span><span class="symbol">:</span>&nbsp;<span class="symbol">(</span><span class="symbol">)</span>&nbsp;<span class="symbol">-&gt;</span>&nbsp;<span class="identifier">A</span><span class="symbol">)</span><span class="symbol">: </span><a href="index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span></code><br/>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">impure</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock.Generator.Companion$impure(kotlin.Function0((net.corda.client.mock.Generator.Companion.impure.A)))/valueClosure">valueClosure</span><span class="symbol">:</span>&nbsp;<span class="symbol">(</span><span class="symbol">)</span>&nbsp;<span class="symbol">-&gt;</span>&nbsp;<span class="identifier">A</span><span class="symbol">)</span><span class="symbol">: </span><a href="index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span></code><br/>
 <br/>
 <br/>
 </BODY>
--- a/docs/build/html/api/net.corda.client.mock/-generator/index.html
+++ b/docs/build/html/api/net.corda.client.mock/-generator/index.html
--- a/docs/build/html/api/net.corda.client.mock/-generator/map.html
+++ b/docs/build/html/api/net.corda.client.mock/-generator/map.html
@ -8,7 +8,7 @@
 <br/>
 <h1>map</h1>
 <a name="net.corda.client.mock.Generator$map(kotlin.Function1((net.corda.client.mock.Generator.A, net.corda.client.mock.Generator.map.B)))"></a>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">B</span><span class="symbol">&gt;</span> <span class="identifier">map</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock.Generator$map(kotlin.Function1((net.corda.client.mock.Generator.A, net.corda.client.mock.Generator.map.B)))/function">function</span><span class="symbol">:</span>&nbsp;<span class="symbol">(</span><span class="identifier">A</span><span class="symbol">)</span>&nbsp;<span class="symbol">-&gt;</span>&nbsp;<span class="identifier">B</span><span class="symbol">)</span><span class="symbol">: </span><a href="index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">B</span><span class="symbol">&gt;</span></code><br/>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">B</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">map</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock.Generator$map(kotlin.Function1((net.corda.client.mock.Generator.A, net.corda.client.mock.Generator.map.B)))/function">function</span><span class="symbol">:</span>&nbsp;<span class="symbol">(</span><span class="identifier">A</span><span class="symbol">)</span>&nbsp;<span class="symbol">-&gt;</span>&nbsp;<span class="identifier">B</span><span class="symbol">)</span><span class="symbol">: </span><a href="index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">B</span><span class="symbol">&gt;</span></code><br/>
 <br/>
 <br/>
 </BODY>
--- a/docs/build/html/api/net.corda.client.mock/-generator/product.html
+++ b/docs/build/html/api/net.corda.client.mock/-generator/product.html
@ -8,7 +8,7 @@
 <br/>
 <h1>product</h1>
 <a name="net.corda.client.mock.Generator$product(net.corda.client.mock.Generator((kotlin.Function1((net.corda.client.mock.Generator.A, net.corda.client.mock.Generator.product.B)))))"></a>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">B</span><span class="symbol">&gt;</span> <span class="identifier">product</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock.Generator$product(net.corda.client.mock.Generator((kotlin.Function1((net.corda.client.mock.Generator.A, net.corda.client.mock.Generator.product.B)))))/other">other</span><span class="symbol">:</span>&nbsp;<a href="index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="symbol">(</span><span class="identifier">A</span><span class="symbol">)</span>&nbsp;<span class="symbol">-&gt;</span>&nbsp;<span class="identifier">B</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">B</span><span class="symbol">&gt;</span></code><br/>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">B</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">product</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock.Generator$product(net.corda.client.mock.Generator((kotlin.Function1((net.corda.client.mock.Generator.A, net.corda.client.mock.Generator.product.B)))))/other">other</span><span class="symbol">:</span>&nbsp;<a href="index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="symbol">(</span><span class="identifier">A</span><span class="symbol">)</span>&nbsp;<span class="symbol">-&gt;</span>&nbsp;<span class="identifier">B</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">B</span><span class="symbol">&gt;</span></code><br/>
 <br/>
 <br/>
 </BODY>
--- a/docs/build/html/api/net.corda.client.mock/-generator/pure.html
+++ b/docs/build/html/api/net.corda.client.mock/-generator/pure.html
@ -8,7 +8,7 @@
 <br/>
 <h1>pure</h1>
 <a name="net.corda.client.mock.Generator.Companion$pure(net.corda.client.mock.Generator.Companion.pure.A)"></a>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span> <span class="identifier">pure</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock.Generator.Companion$pure(net.corda.client.mock.Generator.Companion.pure.A)/value">value</span><span class="symbol">:</span>&nbsp;<span class="identifier">A</span><span class="symbol">)</span><span class="symbol">: </span><a href="index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span></code><br/>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">pure</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock.Generator.Companion$pure(net.corda.client.mock.Generator.Companion.pure.A)/value">value</span><span class="symbol">:</span>&nbsp;<span class="identifier">A</span><span class="symbol">)</span><span class="symbol">: </span><a href="index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span></code><br/>
 <br/>
 <br/>
 </BODY>
--- a/docs/build/html/api/net.corda.client.mock/-generator/sequence.html
+++ b/docs/build/html/api/net.corda.client.mock/-generator/sequence.html
@ -8,7 +8,7 @@
 <br/>
 <h1>sequence</h1>
 <a name="net.corda.client.mock.Generator.Companion$sequence(kotlin.collections.List((net.corda.client.mock.Generator((net.corda.client.mock.Generator.Companion.sequence.A)))))"></a>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span> <span class="identifier">sequence</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock.Generator.Companion$sequence(kotlin.collections.List((net.corda.client.mock.Generator((net.corda.client.mock.Generator.Companion.sequence.A)))))/generators">generators</span><span class="symbol">:</span>&nbsp;<span class="identifier">List</span><span class="symbol">&lt;</span><a href="index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span></code><br/>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">sequence</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock.Generator.Companion$sequence(kotlin.collections.List((net.corda.client.mock.Generator((net.corda.client.mock.Generator.Companion.sequence.A)))))/generators">generators</span><span class="symbol">:</span>&nbsp;<span class="identifier">List</span><span class="symbol">&lt;</span><a href="index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span></code><br/>
 <br/>
 <br/>
 </BODY>
--- a/docs/build/html/api/net.corda.client.mock/-generator/success.html
+++ b/docs/build/html/api/net.corda.client.mock/-generator/success.html
@ -7,8 +7,8 @@
 <a href="../index.html">net.corda.client.mock</a>&nbsp;/&nbsp;<a href="index.html">Generator</a>&nbsp;/&nbsp;<a href=".">success</a><br/>
 <br/>
 <h1>success</h1>
-<a name="net.corda.client.mock.Generator.Companion$success(kotlin.Function1((java.util.Random, net.corda.client.mock.Generator.Companion.success.A)))"></a>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span> <span class="identifier">success</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock.Generator.Companion$success(kotlin.Function1((java.util.Random, net.corda.client.mock.Generator.Companion.success.A)))/generate">generate</span><span class="symbol">:</span>&nbsp;<span class="symbol">(</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Random.html"><span class="identifier">Random</span></a><span class="symbol">)</span>&nbsp;<span class="symbol">-&gt;</span>&nbsp;<span class="identifier">A</span><span class="symbol">)</span><span class="symbol">: </span><a href="index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span></code><br/>
+<a name="net.corda.client.mock.Generator.Companion$success(kotlin.Function1((java.util.SplittableRandom, net.corda.client.mock.Generator.Companion.success.A)))"></a>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">success</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock.Generator.Companion$success(kotlin.Function1((java.util.SplittableRandom, net.corda.client.mock.Generator.Companion.success.A)))/generate">generate</span><span class="symbol">:</span>&nbsp;<span class="symbol">(</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/SplittableRandom.html"><span class="identifier">SplittableRandom</span></a><span class="symbol">)</span>&nbsp;<span class="symbol">-&gt;</span>&nbsp;<span class="identifier">A</span><span class="symbol">)</span><span class="symbol">: </span><a href="index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span></code><br/>
 <br/>
 <br/>
 </BODY>
--- a/docs/build/html/api/net.corda.client.mock/bytes.html
+++ b/docs/build/html/api/net.corda.client.mock/bytes.html
@ -0,0 +1,15 @@
+<HTML>
+<HEAD>
+<title>net.corda.client.mock.bytes - </title>
+<link rel="stylesheet" href="../style.css">
+</HEAD>
+<BODY>
+<a href="index.html">net.corda.client.mock</a>&nbsp;/&nbsp;<a href=".">bytes</a><br/>
+<br/>
+<h1>bytes</h1>
+<a name="net.corda.client.mock$bytes(net.corda.client.mock.Generator.Companion, kotlin.Int)"></a>
+<code><span class="keyword">fun </span><span class="identifier">Generator.Companion</span><span class="symbol">.</span><span class="identifier">bytes</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$bytes(net.corda.client.mock.Generator.Companion, kotlin.Int)/size">size</span><span class="symbol">:</span>&nbsp;<span class="identifier">Int</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">ByteArray</span><span class="symbol">&gt;</span></code><br/>
+<br/>
+<br/>
+</BODY>
+</HTML>
--- a/docs/build/html/api/net.corda.client.mock/frequency.html
+++ b/docs/build/html/api/net.corda.client.mock/frequency.html
@ -0,0 +1,15 @@
+<HTML>
+<HEAD>
+<title>net.corda.client.mock.frequency - </title>
+<link rel="stylesheet" href="../style.css">
+</HEAD>
+<BODY>
+<a href="index.html">net.corda.client.mock</a>&nbsp;/&nbsp;<a href=".">frequency</a><br/>
+<br/>
+<h1>frequency</h1>
+<a name="net.corda.client.mock$frequency(net.corda.client.mock.Generator.Companion, kotlin.Array((((kotlin.Double, net.corda.client.mock.Generator((net.corda.client.mock.frequency.A)))))))"></a>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">Generator.Companion</span><span class="symbol">.</span><span class="identifier">frequency</span><span class="symbol">(</span><span class="keyword">vararg</span> <span class="identifier" id="net.corda.client.mock$frequency(net.corda.client.mock.Generator.Companion, kotlin.Array((((kotlin.Double, net.corda.client.mock.Generator((net.corda.client.mock.frequency.A)))))))/generators">generators</span><span class="symbol">:</span>&nbsp;<span class="identifier">&lt;ERROR CLASS&gt;</span><span class="symbol">&lt;</span><span class="identifier">Double</span><span class="symbol">,</span>&nbsp;<a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code><br/>
+<br/>
+<br/>
+</BODY>
+</HTML>
--- a/docs/build/html/api/net.corda.client.mock/generate-amount.html
+++ b/docs/build/html/api/net.corda.client.mock/generate-amount.html
@ -0,0 +1,15 @@
+<HTML>
+<HEAD>
+<title>generateAmount - </title>
+<link rel="stylesheet" href="../style.css">
+</HEAD>
+<BODY>
+<a href="index.html">net.corda.client.mock</a>&nbsp;/&nbsp;<a href=".">generateAmount</a><br/>
+<br/>
+<h1>generateAmount</h1>
+<a name="net.corda.client.mock$generateAmount(kotlin.Long, kotlin.Long, net.corda.client.mock.Generator((net.corda.client.mock.generateAmount.T)))"></a>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">generateAmount</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$generateAmount(kotlin.Long, kotlin.Long, net.corda.client.mock.Generator((net.corda.client.mock.generateAmount.T)))/min">min</span><span class="symbol">:</span>&nbsp;<span class="identifier">Long</span><span class="symbol">, </span><span class="identifier" id="net.corda.client.mock$generateAmount(kotlin.Long, kotlin.Long, net.corda.client.mock.Generator((net.corda.client.mock.generateAmount.T)))/max">max</span><span class="symbol">:</span>&nbsp;<span class="identifier">Long</span><span class="symbol">, </span><span class="identifier" id="net.corda.client.mock$generateAmount(kotlin.Long, kotlin.Long, net.corda.client.mock.Generator((net.corda.client.mock.generateAmount.T)))/tokenGenerator">tokenGenerator</span><span class="symbol">:</span>&nbsp;<a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><a href="../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span></code><br/>
+<br/>
+<br/>
+</BODY>
+</HTML>
--- a/docs/build/html/api/net.corda.client.mock/generate-currency-amount.html
+++ b/docs/build/html/api/net.corda.client.mock/generate-currency-amount.html
@ -0,0 +1,15 @@
+<HTML>
+<HEAD>
+<title>generateCurrencyAmount - </title>
+<link rel="stylesheet" href="../style.css">
+</HEAD>
+<BODY>
+<a href="index.html">net.corda.client.mock</a>&nbsp;/&nbsp;<a href=".">generateCurrencyAmount</a><br/>
+<br/>
+<h1>generateCurrencyAmount</h1>
+<a name="net.corda.client.mock$generateCurrencyAmount(kotlin.Long, kotlin.Long)"></a>
+<code><span class="keyword">fun </span><span class="identifier">generateCurrencyAmount</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$generateCurrencyAmount(kotlin.Long, kotlin.Long)/min">min</span><span class="symbol">:</span>&nbsp;<span class="identifier">Long</span><span class="symbol">, </span><span class="identifier" id="net.corda.client.mock$generateCurrencyAmount(kotlin.Long, kotlin.Long)/max">max</span><span class="symbol">:</span>&nbsp;<span class="identifier">Long</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><a href="../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span></code><br/>
+<br/>
+<br/>
+</BODY>
+</HTML>
--- a/docs/build/html/api/net.corda.client.mock/generate-currency.html
+++ b/docs/build/html/api/net.corda.client.mock/generate-currency.html
@ -0,0 +1,15 @@
+<HTML>
+<HEAD>
+<title>generateCurrency - </title>
+<link rel="stylesheet" href="../style.css">
+</HEAD>
+<BODY>
+<a href="index.html">net.corda.client.mock</a>&nbsp;/&nbsp;<a href=".">generateCurrency</a><br/>
+<br/>
+<h1>generateCurrency</h1>
+<a name="net.corda.client.mock$generateCurrency()"></a>
+<code><span class="keyword">fun </span><span class="identifier">generateCurrency</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span></code><br/>
+<br/>
+<br/>
+</BODY>
+</HTML>
--- a/docs/build/html/api/net.corda.client.mock/generate-issue-ref.html
+++ b/docs/build/html/api/net.corda.client.mock/generate-issue-ref.html
@ -0,0 +1,15 @@
+<HTML>
+<HEAD>
+<title>generateIssueRef - </title>
+<link rel="stylesheet" href="../style.css">
+</HEAD>
+<BODY>
+<a href="index.html">net.corda.client.mock</a>&nbsp;/&nbsp;<a href=".">generateIssueRef</a><br/>
+<br/>
+<h1>generateIssueRef</h1>
+<a name="net.corda.client.mock$generateIssueRef(kotlin.Int)"></a>
+<code><span class="keyword">fun </span><span class="identifier">generateIssueRef</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$generateIssueRef(kotlin.Int)/size">size</span><span class="symbol">:</span>&nbsp;<span class="identifier">Int</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><a href="../net.corda.core.serialization/-opaque-bytes/index.html"><span class="identifier">OpaqueBytes</span></a><span class="symbol">&gt;</span></code><br/>
+<br/>
+<br/>
+</BODY>
+</HTML>
--- a/docs/build/html/api/net.corda.client.mock/generate-or-fail.html
+++ b/docs/build/html/api/net.corda.client.mock/generate-or-fail.html
@ -7,8 +7,8 @@
 <a href="index.html">net.corda.client.mock</a>&nbsp;/&nbsp;<a href=".">generateOrFail</a><br/>
 <br/>
 <h1>generateOrFail</h1>
-<a name="net.corda.client.mock$generateOrFail(net.corda.client.mock.Generator((net.corda.client.mock.generateOrFail.A)), java.util.Random, kotlin.Int)"></a>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span> <a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">generateOrFail</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$generateOrFail(net.corda.client.mock.Generator((net.corda.client.mock.generateOrFail.A)), java.util.Random, kotlin.Int)/random">random</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/util/Random.html"><span class="identifier">Random</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.client.mock$generateOrFail(net.corda.client.mock.Generator((net.corda.client.mock.generateOrFail.A)), java.util.Random, kotlin.Int)/numberOfTries">numberOfTries</span><span class="symbol">:</span>&nbsp;<span class="identifier">Int</span>&nbsp;<span class="symbol">=</span>&nbsp;1<span class="symbol">)</span><span class="symbol">: </span><span class="identifier">A</span></code><br/>
+<a name="net.corda.client.mock$generateOrFail(net.corda.client.mock.Generator((net.corda.client.mock.generateOrFail.A)), java.util.SplittableRandom, kotlin.Int)"></a>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">generateOrFail</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$generateOrFail(net.corda.client.mock.Generator((net.corda.client.mock.generateOrFail.A)), java.util.SplittableRandom, kotlin.Int)/random">random</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/util/SplittableRandom.html"><span class="identifier">SplittableRandom</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.client.mock$generateOrFail(net.corda.client.mock.Generator((net.corda.client.mock.generateOrFail.A)), java.util.SplittableRandom, kotlin.Int)/numberOfTries">numberOfTries</span><span class="symbol">:</span>&nbsp;<span class="identifier">Int</span>&nbsp;<span class="symbol">=</span>&nbsp;1<span class="symbol">)</span><span class="symbol">: </span><span class="identifier">A</span></code><br/>
 <br/>
 <br/>
 </BODY>
--- a/docs/build/html/api/net.corda.client.mock/index.html
+++ b/docs/build/html/api/net.corda.client.mock/index.html
@ -22,7 +22,7 @@ state/ref pairs, but it doesnt necessarily generate "correct" events</p>
 <td>
 <a href="-generator/index.html">Generator</a></td>
 <td>
-<code><span class="keyword">class </span><span class="identifier">Generator</span><span class="symbol">&lt;</span><span class="keyword">out</span>&nbsp;<span class="identifier">A</span><span class="symbol">&gt;</span></code><p>This file defines a basic <a href="-generator/index.html">Generator</a> library for composing random generators of objects.</p>
+<code><span class="keyword">class </span><span class="identifier">Generator</span><span class="symbol">&lt;</span><span class="keyword">out</span>&nbsp;<span class="identifier">A</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span></code><p>This file defines a basic <a href="-generator/index.html">Generator</a> library for composing random generators of objects.</p>
 </td>
 </tr>
 </tbody>
@ -32,9 +32,33 @@ state/ref pairs, but it doesnt necessarily generate "correct" events</p>
 <tbody>
 <tr>
 <td>
+<a href="generate-amount.html">generateAmount</a></td>
+<td>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">generateAmount</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$generateAmount(kotlin.Long, kotlin.Long, net.corda.client.mock.Generator((net.corda.client.mock.generateAmount.T)))/min">min</span><span class="symbol">:</span>&nbsp;<span class="identifier">Long</span><span class="symbol">, </span><span class="identifier" id="net.corda.client.mock$generateAmount(kotlin.Long, kotlin.Long, net.corda.client.mock.Generator((net.corda.client.mock.generateAmount.T)))/max">max</span><span class="symbol">:</span>&nbsp;<span class="identifier">Long</span><span class="symbol">, </span><span class="identifier" id="net.corda.client.mock$generateAmount(kotlin.Long, kotlin.Long, net.corda.client.mock.Generator((net.corda.client.mock.generateAmount.T)))/tokenGenerator">tokenGenerator</span><span class="symbol">:</span>&nbsp;<a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><a href="../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span></code></td>
+</tr>
+<tr>
+<td>
+<a href="generate-currency.html">generateCurrency</a></td>
+<td>
+<code><span class="keyword">fun </span><span class="identifier">generateCurrency</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span></code></td>
+</tr>
+<tr>
+<td>
+<a href="generate-currency-amount.html">generateCurrencyAmount</a></td>
+<td>
+<code><span class="keyword">fun </span><span class="identifier">generateCurrencyAmount</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$generateCurrencyAmount(kotlin.Long, kotlin.Long)/min">min</span><span class="symbol">:</span>&nbsp;<span class="identifier">Long</span><span class="symbol">, </span><span class="identifier" id="net.corda.client.mock$generateCurrencyAmount(kotlin.Long, kotlin.Long)/max">max</span><span class="symbol">:</span>&nbsp;<span class="identifier">Long</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><a href="../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span></code></td>
+</tr>
+<tr>
+<td>
+<a href="generate-issue-ref.html">generateIssueRef</a></td>
+<td>
+<code><span class="keyword">fun </span><span class="identifier">generateIssueRef</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$generateIssueRef(kotlin.Int)/size">size</span><span class="symbol">:</span>&nbsp;<span class="identifier">Int</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><a href="../net.corda.core.serialization/-opaque-bytes/index.html"><span class="identifier">OpaqueBytes</span></a><span class="symbol">&gt;</span></code></td>
+</tr>
+<tr>
+<td>
 <a href="generate-or-fail.html">generateOrFail</a></td>
 <td>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span> <a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">generateOrFail</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$generateOrFail(net.corda.client.mock.Generator((net.corda.client.mock.generateOrFail.A)), java.util.Random, kotlin.Int)/random">random</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/util/Random.html"><span class="identifier">Random</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.client.mock$generateOrFail(net.corda.client.mock.Generator((net.corda.client.mock.generateOrFail.A)), java.util.Random, kotlin.Int)/numberOfTries">numberOfTries</span><span class="symbol">:</span>&nbsp;<span class="identifier">Int</span>&nbsp;<span class="symbol">=</span>&nbsp;1<span class="symbol">)</span><span class="symbol">: </span><span class="identifier">A</span></code></td>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">generateOrFail</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$generateOrFail(net.corda.client.mock.Generator((net.corda.client.mock.generateOrFail.A)), java.util.SplittableRandom, kotlin.Int)/random">random</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/util/SplittableRandom.html"><span class="identifier">SplittableRandom</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.client.mock$generateOrFail(net.corda.client.mock.Generator((net.corda.client.mock.generateOrFail.A)), java.util.SplittableRandom, kotlin.Int)/numberOfTries">numberOfTries</span><span class="symbol">:</span>&nbsp;<span class="identifier">Int</span>&nbsp;<span class="symbol">=</span>&nbsp;1<span class="symbol">)</span><span class="symbol">: </span><span class="identifier">A</span></code></td>
 </tr>
 </tbody>
 </table>
@ -43,6 +67,12 @@ state/ref pairs, but it doesnt necessarily generate "correct" events</p>
 <tbody>
 <tr>
 <td>
+<a href="bytes.html">bytes</a></td>
+<td>
+<code><span class="keyword">fun </span><span class="identifier">Generator.Companion</span><span class="symbol">.</span><span class="identifier">bytes</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$bytes(net.corda.client.mock.Generator.Companion, kotlin.Int)/size">size</span><span class="symbol">:</span>&nbsp;<span class="identifier">Int</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">ByteArray</span><span class="symbol">&gt;</span></code></td>
+</tr>
+<tr>
+<td>
 <a href="double.html">double</a></td>
 <td>
 <code><span class="keyword">fun </span><span class="identifier">Generator.Companion</span><span class="symbol">.</span><span class="identifier">double</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">Double</span><span class="symbol">&gt;</span></code></td>
@ -55,6 +85,12 @@ state/ref pairs, but it doesnt necessarily generate "correct" events</p>
 </tr>
 <tr>
 <td>
+<a href="frequency.html">frequency</a></td>
+<td>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">Generator.Companion</span><span class="symbol">.</span><span class="identifier">frequency</span><span class="symbol">(</span><span class="keyword">vararg</span> <span class="identifier" id="net.corda.client.mock$frequency(net.corda.client.mock.Generator.Companion, kotlin.Array((((kotlin.Double, net.corda.client.mock.Generator((net.corda.client.mock.frequency.A)))))))/generators">generators</span><span class="symbol">:</span>&nbsp;<span class="identifier">&lt;ERROR CLASS&gt;</span><span class="symbol">&lt;</span><span class="identifier">Double</span><span class="symbol">,</span>&nbsp;<a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code></td>
+</tr>
+<tr>
+<td>
 <a href="int.html">int</a></td>
 <td>
 <code><span class="keyword">fun </span><span class="identifier">Generator.Companion</span><span class="symbol">.</span><span class="identifier">int</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">Int</span><span class="symbol">&gt;</span></code></td>
@ -63,31 +99,39 @@ state/ref pairs, but it doesnt necessarily generate "correct" events</p>
 <td>
 <a href="int-range.html">intRange</a></td>
 <td>
+<code><span class="keyword">fun </span><span class="identifier">Generator.Companion</span><span class="symbol">.</span><span class="identifier">intRange</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$intRange(net.corda.client.mock.Generator.Companion, kotlin.ranges.IntRange)/range">range</span><span class="symbol">:</span>&nbsp;<span class="identifier">IntRange</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">Int</span><span class="symbol">&gt;</span></code><br/>
 <code><span class="keyword">fun </span><span class="identifier">Generator.Companion</span><span class="symbol">.</span><span class="identifier">intRange</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$intRange(net.corda.client.mock.Generator.Companion, kotlin.Int, kotlin.Int)/from">from</span><span class="symbol">:</span>&nbsp;<span class="identifier">Int</span><span class="symbol">, </span><span class="identifier" id="net.corda.client.mock$intRange(net.corda.client.mock.Generator.Companion, kotlin.Int, kotlin.Int)/to">to</span><span class="symbol">:</span>&nbsp;<span class="identifier">Int</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">Int</span><span class="symbol">&gt;</span></code></td>
 </tr>
 <tr>
 <td>
-<a href="one-of.html">oneOf</a></td>
+<a href="long-range.html">longRange</a></td>
 <td>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span> <span class="identifier">Generator.Companion</span><span class="symbol">.</span><span class="identifier">oneOf</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$oneOf(net.corda.client.mock.Generator.Companion, kotlin.collections.List((net.corda.client.mock.oneOf.A)))/list">list</span><span class="symbol">:</span>&nbsp;<span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span></code></td>
+<code><span class="keyword">fun </span><span class="identifier">Generator.Companion</span><span class="symbol">.</span><span class="identifier">longRange</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$longRange(net.corda.client.mock.Generator.Companion, kotlin.ranges.LongRange)/range">range</span><span class="symbol">:</span>&nbsp;<span class="identifier">LongRange</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">Long</span><span class="symbol">&gt;</span></code><br/>
+<code><span class="keyword">fun </span><span class="identifier">Generator.Companion</span><span class="symbol">.</span><span class="identifier">longRange</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$longRange(net.corda.client.mock.Generator.Companion, kotlin.Long, kotlin.Long)/from">from</span><span class="symbol">:</span>&nbsp;<span class="identifier">Long</span><span class="symbol">, </span><span class="identifier" id="net.corda.client.mock$longRange(net.corda.client.mock.Generator.Companion, kotlin.Long, kotlin.Long)/to">to</span><span class="symbol">:</span>&nbsp;<span class="identifier">Long</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">Long</span><span class="symbol">&gt;</span></code></td>
+</tr>
+<tr>
+<td>
+<a href="pick-n.html">pickN</a></td>
+<td>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">Generator.Companion</span><span class="symbol">.</span><span class="identifier">pickN</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$pickN(net.corda.client.mock.Generator.Companion, kotlin.Int, kotlin.collections.List((net.corda.client.mock.pickN.A)))/number">number</span><span class="symbol">:</span>&nbsp;<span class="identifier">Int</span><span class="symbol">, </span><span class="identifier" id="net.corda.client.mock$pickN(net.corda.client.mock.Generator.Companion, kotlin.Int, kotlin.collections.List((net.corda.client.mock.pickN.A)))/list">list</span><span class="symbol">:</span>&nbsp;<span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span></code></td>
 </tr>
 <tr>
 <td>
 <a href="pick-one.html">pickOne</a></td>
 <td>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span> <span class="identifier">Generator.Companion</span><span class="symbol">.</span><span class="identifier">pickOne</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$pickOne(net.corda.client.mock.Generator.Companion, kotlin.collections.List((net.corda.client.mock.pickOne.A)))/list">list</span><span class="symbol">:</span>&nbsp;<span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span></code></td>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">Generator.Companion</span><span class="symbol">.</span><span class="identifier">pickOne</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$pickOne(net.corda.client.mock.Generator.Companion, kotlin.collections.List((net.corda.client.mock.pickOne.A)))/list">list</span><span class="symbol">:</span>&nbsp;<span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span></code></td>
 </tr>
 <tr>
 <td>
 <a href="replicate.html">replicate</a></td>
 <td>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span> <span class="identifier">Generator.Companion</span><span class="symbol">.</span><span class="identifier">replicate</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$replicate(net.corda.client.mock.Generator.Companion, kotlin.Int, net.corda.client.mock.Generator((net.corda.client.mock.replicate.A)))/number">number</span><span class="symbol">:</span>&nbsp;<span class="identifier">Int</span><span class="symbol">, </span><span class="identifier" id="net.corda.client.mock$replicate(net.corda.client.mock.Generator.Companion, kotlin.Int, net.corda.client.mock.Generator((net.corda.client.mock.replicate.A)))/generator">generator</span><span class="symbol">:</span>&nbsp;<a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span></code></td>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">Generator.Companion</span><span class="symbol">.</span><span class="identifier">replicate</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$replicate(net.corda.client.mock.Generator.Companion, kotlin.Int, net.corda.client.mock.Generator((net.corda.client.mock.replicate.A)))/number">number</span><span class="symbol">:</span>&nbsp;<span class="identifier">Int</span><span class="symbol">, </span><span class="identifier" id="net.corda.client.mock$replicate(net.corda.client.mock.Generator.Companion, kotlin.Int, net.corda.client.mock.Generator((net.corda.client.mock.replicate.A)))/generator">generator</span><span class="symbol">:</span>&nbsp;<a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span></code></td>
 </tr>
 <tr>
 <td>
 <a href="replicate-poisson.html">replicatePoisson</a></td>
 <td>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span> <span class="identifier">Generator.Companion</span><span class="symbol">.</span><span class="identifier">replicatePoisson</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$replicatePoisson(net.corda.client.mock.Generator.Companion, kotlin.Double, net.corda.client.mock.Generator((net.corda.client.mock.replicatePoisson.A)))/meanSize">meanSize</span><span class="symbol">:</span>&nbsp;<span class="identifier">Double</span><span class="symbol">, </span><span class="identifier" id="net.corda.client.mock$replicatePoisson(net.corda.client.mock.Generator.Companion, kotlin.Double, net.corda.client.mock.Generator((net.corda.client.mock.replicatePoisson.A)))/generator">generator</span><span class="symbol">:</span>&nbsp;<a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span></code></td>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">Generator.Companion</span><span class="symbol">.</span><span class="identifier">replicatePoisson</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$replicatePoisson(net.corda.client.mock.Generator.Companion, kotlin.Double, net.corda.client.mock.Generator((net.corda.client.mock.replicatePoisson.A)))/meanSize">meanSize</span><span class="symbol">:</span>&nbsp;<span class="identifier">Double</span><span class="symbol">, </span><span class="identifier" id="net.corda.client.mock$replicatePoisson(net.corda.client.mock.Generator.Companion, kotlin.Double, net.corda.client.mock.Generator((net.corda.client.mock.replicatePoisson.A)))/generator">generator</span><span class="symbol">:</span>&nbsp;<a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span></code></td>
 </tr>
 <tr>
 <td>
--- a/docs/build/html/api/net.corda.client.mock/int-range.html
+++ b/docs/build/html/api/net.corda.client.mock/int-range.html
@ -7,6 +7,8 @@
 <a href="index.html">net.corda.client.mock</a>&nbsp;/&nbsp;<a href=".">intRange</a><br/>
 <br/>
 <h1>intRange</h1>
+<a name="net.corda.client.mock$intRange(net.corda.client.mock.Generator.Companion, kotlin.ranges.IntRange)"></a>
+<code><span class="keyword">fun </span><span class="identifier">Generator.Companion</span><span class="symbol">.</span><span class="identifier">intRange</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$intRange(net.corda.client.mock.Generator.Companion, kotlin.ranges.IntRange)/range">range</span><span class="symbol">:</span>&nbsp;<span class="identifier">IntRange</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">Int</span><span class="symbol">&gt;</span></code><br/>
 <a name="net.corda.client.mock$intRange(net.corda.client.mock.Generator.Companion, kotlin.Int, kotlin.Int)"></a>
 <code><span class="keyword">fun </span><span class="identifier">Generator.Companion</span><span class="symbol">.</span><span class="identifier">intRange</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$intRange(net.corda.client.mock.Generator.Companion, kotlin.Int, kotlin.Int)/from">from</span><span class="symbol">:</span>&nbsp;<span class="identifier">Int</span><span class="symbol">, </span><span class="identifier" id="net.corda.client.mock$intRange(net.corda.client.mock.Generator.Companion, kotlin.Int, kotlin.Int)/to">to</span><span class="symbol">:</span>&nbsp;<span class="identifier">Int</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">Int</span><span class="symbol">&gt;</span></code><br/>
 <br/>
--- a/docs/build/html/api/net.corda.client.mock/long-range.html
+++ b/docs/build/html/api/net.corda.client.mock/long-range.html
@ -0,0 +1,17 @@
+<HTML>
+<HEAD>
+<title>net.corda.client.mock.longRange - </title>
+<link rel="stylesheet" href="../style.css">
+</HEAD>
+<BODY>
+<a href="index.html">net.corda.client.mock</a>&nbsp;/&nbsp;<a href=".">longRange</a><br/>
+<br/>
+<h1>longRange</h1>
+<a name="net.corda.client.mock$longRange(net.corda.client.mock.Generator.Companion, kotlin.ranges.LongRange)"></a>
+<code><span class="keyword">fun </span><span class="identifier">Generator.Companion</span><span class="symbol">.</span><span class="identifier">longRange</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$longRange(net.corda.client.mock.Generator.Companion, kotlin.ranges.LongRange)/range">range</span><span class="symbol">:</span>&nbsp;<span class="identifier">LongRange</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">Long</span><span class="symbol">&gt;</span></code><br/>
+<a name="net.corda.client.mock$longRange(net.corda.client.mock.Generator.Companion, kotlin.Long, kotlin.Long)"></a>
+<code><span class="keyword">fun </span><span class="identifier">Generator.Companion</span><span class="symbol">.</span><span class="identifier">longRange</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$longRange(net.corda.client.mock.Generator.Companion, kotlin.Long, kotlin.Long)/from">from</span><span class="symbol">:</span>&nbsp;<span class="identifier">Long</span><span class="symbol">, </span><span class="identifier" id="net.corda.client.mock$longRange(net.corda.client.mock.Generator.Companion, kotlin.Long, kotlin.Long)/to">to</span><span class="symbol">:</span>&nbsp;<span class="identifier">Long</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">Long</span><span class="symbol">&gt;</span></code><br/>
+<br/>
+<br/>
+</BODY>
+</HTML>
--- a/docs/build/html/api/net.corda.client.mock/one-of.html
+++ b/docs/build/html/api/net.corda.client.mock/one-of.html
@ -1,15 +0,0 @@
-<HTML>
-<HEAD>
-<title>net.corda.client.mock.oneOf - </title>
-<link rel="stylesheet" href="../style.css">
-</HEAD>
-<BODY>
-<a href="index.html">net.corda.client.mock</a>&nbsp;/&nbsp;<a href=".">oneOf</a><br/>
-<br/>
-<h1>oneOf</h1>
-<a name="net.corda.client.mock$oneOf(net.corda.client.mock.Generator.Companion, kotlin.collections.List((net.corda.client.mock.oneOf.A)))"></a>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span> <span class="identifier">Generator.Companion</span><span class="symbol">.</span><span class="identifier">oneOf</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$oneOf(net.corda.client.mock.Generator.Companion, kotlin.collections.List((net.corda.client.mock.oneOf.A)))/list">list</span><span class="symbol">:</span>&nbsp;<span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span></code><br/>
-<br/>
-<br/>
-</BODY>
-</HTML>
--- a/docs/build/html/api/net.corda.client.mock/pick-n.html
+++ b/docs/build/html/api/net.corda.client.mock/pick-n.html
@ -0,0 +1,15 @@
+<HTML>
+<HEAD>
+<title>net.corda.client.mock.pickN - </title>
+<link rel="stylesheet" href="../style.css">
+</HEAD>
+<BODY>
+<a href="index.html">net.corda.client.mock</a>&nbsp;/&nbsp;<a href=".">pickN</a><br/>
+<br/>
+<h1>pickN</h1>
+<a name="net.corda.client.mock$pickN(net.corda.client.mock.Generator.Companion, kotlin.Int, kotlin.collections.List((net.corda.client.mock.pickN.A)))"></a>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">Generator.Companion</span><span class="symbol">.</span><span class="identifier">pickN</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$pickN(net.corda.client.mock.Generator.Companion, kotlin.Int, kotlin.collections.List((net.corda.client.mock.pickN.A)))/number">number</span><span class="symbol">:</span>&nbsp;<span class="identifier">Int</span><span class="symbol">, </span><span class="identifier" id="net.corda.client.mock$pickN(net.corda.client.mock.Generator.Companion, kotlin.Int, kotlin.collections.List((net.corda.client.mock.pickN.A)))/list">list</span><span class="symbol">:</span>&nbsp;<span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span></code><br/>
+<br/>
+<br/>
+</BODY>
+</HTML>
--- a/docs/build/html/api/net.corda.client.mock/pick-one.html
+++ b/docs/build/html/api/net.corda.client.mock/pick-one.html
@ -8,7 +8,7 @@
 <br/>
 <h1>pickOne</h1>
 <a name="net.corda.client.mock$pickOne(net.corda.client.mock.Generator.Companion, kotlin.collections.List((net.corda.client.mock.pickOne.A)))"></a>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span> <span class="identifier">Generator.Companion</span><span class="symbol">.</span><span class="identifier">pickOne</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$pickOne(net.corda.client.mock.Generator.Companion, kotlin.collections.List((net.corda.client.mock.pickOne.A)))/list">list</span><span class="symbol">:</span>&nbsp;<span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span></code><br/>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">Generator.Companion</span><span class="symbol">.</span><span class="identifier">pickOne</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$pickOne(net.corda.client.mock.Generator.Companion, kotlin.collections.List((net.corda.client.mock.pickOne.A)))/list">list</span><span class="symbol">:</span>&nbsp;<span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span></code><br/>
 <br/>
 <br/>
 </BODY>
--- a/docs/build/html/api/net.corda.client.mock/replicate-poisson.html
+++ b/docs/build/html/api/net.corda.client.mock/replicate-poisson.html
@ -8,7 +8,7 @@
 <br/>
 <h1>replicatePoisson</h1>
 <a name="net.corda.client.mock$replicatePoisson(net.corda.client.mock.Generator.Companion, kotlin.Double, net.corda.client.mock.Generator((net.corda.client.mock.replicatePoisson.A)))"></a>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span> <span class="identifier">Generator.Companion</span><span class="symbol">.</span><span class="identifier">replicatePoisson</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$replicatePoisson(net.corda.client.mock.Generator.Companion, kotlin.Double, net.corda.client.mock.Generator((net.corda.client.mock.replicatePoisson.A)))/meanSize">meanSize</span><span class="symbol">:</span>&nbsp;<span class="identifier">Double</span><span class="symbol">, </span><span class="identifier" id="net.corda.client.mock$replicatePoisson(net.corda.client.mock.Generator.Companion, kotlin.Double, net.corda.client.mock.Generator((net.corda.client.mock.replicatePoisson.A)))/generator">generator</span><span class="symbol">:</span>&nbsp;<a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span></code><br/>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">Generator.Companion</span><span class="symbol">.</span><span class="identifier">replicatePoisson</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$replicatePoisson(net.corda.client.mock.Generator.Companion, kotlin.Double, net.corda.client.mock.Generator((net.corda.client.mock.replicatePoisson.A)))/meanSize">meanSize</span><span class="symbol">:</span>&nbsp;<span class="identifier">Double</span><span class="symbol">, </span><span class="identifier" id="net.corda.client.mock$replicatePoisson(net.corda.client.mock.Generator.Companion, kotlin.Double, net.corda.client.mock.Generator((net.corda.client.mock.replicatePoisson.A)))/generator">generator</span><span class="symbol">:</span>&nbsp;<a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span></code><br/>
 <br/>
 <br/>
 </BODY>
--- a/docs/build/html/api/net.corda.client.mock/replicate.html
+++ b/docs/build/html/api/net.corda.client.mock/replicate.html
@ -8,7 +8,7 @@
 <br/>
 <h1>replicate</h1>
 <a name="net.corda.client.mock$replicate(net.corda.client.mock.Generator.Companion, kotlin.Int, net.corda.client.mock.Generator((net.corda.client.mock.replicate.A)))"></a>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span> <span class="identifier">Generator.Companion</span><span class="symbol">.</span><span class="identifier">replicate</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$replicate(net.corda.client.mock.Generator.Companion, kotlin.Int, net.corda.client.mock.Generator((net.corda.client.mock.replicate.A)))/number">number</span><span class="symbol">:</span>&nbsp;<span class="identifier">Int</span><span class="symbol">, </span><span class="identifier" id="net.corda.client.mock$replicate(net.corda.client.mock.Generator.Companion, kotlin.Int, net.corda.client.mock.Generator((net.corda.client.mock.replicate.A)))/generator">generator</span><span class="symbol">:</span>&nbsp;<a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span></code><br/>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Any</span><span class="symbol">&gt;</span> <span class="identifier">Generator.Companion</span><span class="symbol">.</span><span class="identifier">replicate</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.mock$replicate(net.corda.client.mock.Generator.Companion, kotlin.Int, net.corda.client.mock.Generator((net.corda.client.mock.replicate.A)))/number">number</span><span class="symbol">:</span>&nbsp;<span class="identifier">Int</span><span class="symbol">, </span><span class="identifier" id="net.corda.client.mock$replicate(net.corda.client.mock.Generator.Companion, kotlin.Int, net.corda.client.mock.Generator((net.corda.client.mock.replicate.A)))/generator">generator</span><span class="symbol">:</span>&nbsp;<a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><a href="-generator/index.html"><span class="identifier">Generator</span></a><span class="symbol">&lt;</span><span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span></code><br/>
 <br/>
 <br/>
 </BODY>
--- a/docs/build/html/api/net.corda.client.model/-contract-state-model/cash-states-diff.html
+++ b/docs/build/html/api/net.corda.client.model/-contract-state-model/cash-states-diff.html
@ -1,15 +0,0 @@
-<HTML>
-<HEAD>
-<title>ContractStateModel.cashStatesDiff - </title>
-<link rel="stylesheet" href="../../style.css">
-</HEAD>
-<BODY>
-<a href="../index.html">net.corda.client.model</a>&nbsp;/&nbsp;<a href="index.html">ContractStateModel</a>&nbsp;/&nbsp;<a href=".">cashStatesDiff</a><br/>
-<br/>
-<h1>cashStatesDiff</h1>
-<a name="net.corda.client.model.ContractStateModel$cashStatesDiff"></a>
-<code><span class="keyword">val </span><span class="identifier">cashStatesDiff</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span><span class="symbol">&lt;</span><a href="../-diff/index.html"><span class="identifier">Diff</span></a><span class="symbol">&lt;</span><a href="../../net.corda.contracts.asset/-cash/-state/index.html"><span class="identifier">State</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span></code><br/>
-<br/>
-<br/>
-</BODY>
-</HTML>
--- a/docs/build/html/api/net.corda.client.model/-contract-state-model/cash.html
+++ b/docs/build/html/api/net.corda.client.model/-contract-state-model/cash.html
@ -0,0 +1,15 @@
+<HTML>
+<HEAD>
+<title>ContractStateModel.cash - </title>
+<link rel="stylesheet" href="../../style.css">
+</HEAD>
+<BODY>
+<a href="../index.html">net.corda.client.model</a>&nbsp;/&nbsp;<a href="index.html">ContractStateModel</a>&nbsp;/&nbsp;<a href=".">cash</a><br/>
+<br/>
+<h1>cash</h1>
+<a name="net.corda.client.model.ContractStateModel$cash"></a>
+<code><span class="keyword">val </span><span class="identifier">cash</span><span class="symbol">: </span><span class="identifier">ObservableList</span><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span></code><br/>
+<br/>
+<br/>
+</BODY>
+</HTML>
--- a/docs/build/html/api/net.corda.client.model/-contract-state-model/contract-states-diff.html
+++ b/docs/build/html/api/net.corda.client.model/-contract-state-model/contract-states-diff.html
@ -1,15 +0,0 @@
-<HTML>
-<HEAD>
-<title>ContractStateModel.contractStatesDiff - </title>
-<link rel="stylesheet" href="../../style.css">
-</HEAD>
-<BODY>
-<a href="../index.html">net.corda.client.model</a>&nbsp;/&nbsp;<a href="index.html">ContractStateModel</a>&nbsp;/&nbsp;<a href=".">contractStatesDiff</a><br/>
-<br/>
-<h1>contractStatesDiff</h1>
-<a name="net.corda.client.model.ContractStateModel$contractStatesDiff"></a>
-<code><span class="keyword">val </span><span class="identifier">contractStatesDiff</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span><span class="symbol">&lt;</span><a href="../-diff/index.html"><span class="identifier">Diff</span></a><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-contract-state/index.html"><span class="identifier">ContractState</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span></code><br/>
-<br/>
-<br/>
-</BODY>
-</HTML>
--- a/docs/build/html/api/net.corda.client.model/-contract-state-model/index.html
+++ b/docs/build/html/api/net.corda.client.model/-contract-state-model/index.html
@ -28,22 +28,16 @@
 <tbody>
 <tr>
 <td>
+<a href="cash.html">cash</a></td>
+<td>
+<code><span class="keyword">val </span><span class="identifier">cash</span><span class="symbol">: </span><span class="identifier">ObservableList</span><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span></code></td>
+</tr>
+<tr>
+<td>
 <a href="cash-states.html">cashStates</a></td>
 <td>
 <code><span class="keyword">val </span><span class="identifier">cashStates</span><span class="symbol">: </span><span class="identifier">ObservableList</span><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-state-and-ref/index.html"><span class="identifier">StateAndRef</span></a><span class="symbol">&lt;</span><a href="../../net.corda.contracts.asset/-cash/-state/index.html"><span class="identifier">State</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span></code></td>
 </tr>
-<tr>
-<td>
-<a href="cash-states-diff.html">cashStatesDiff</a></td>
-<td>
-<code><span class="keyword">val </span><span class="identifier">cashStatesDiff</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span><span class="symbol">&lt;</span><a href="../-diff/index.html"><span class="identifier">Diff</span></a><span class="symbol">&lt;</span><a href="../../net.corda.contracts.asset/-cash/-state/index.html"><span class="identifier">State</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span></code></td>
-</tr>
-<tr>
-<td>
-<a href="contract-states-diff.html">contractStatesDiff</a></td>
-<td>
-<code><span class="keyword">val </span><span class="identifier">contractStatesDiff</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span><span class="symbol">&lt;</span><a href="../-diff/index.html"><span class="identifier">Diff</span></a><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-contract-state/index.html"><span class="identifier">ContractState</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span></code></td>
-</tr>
 </tbody>
 </table>
 </BODY>
--- a/docs/build/html/api/net.corda.client.model/-network-identity-model/index.html
+++ b/docs/build/html/api/net.corda.client.model/-network-identity-model/index.html
@ -51,7 +51,7 @@
 <td>
 <a href="lookup.html">lookup</a></td>
 <td>
-<code><span class="keyword">fun </span><span class="identifier">lookup</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.model.NetworkIdentityModel$lookup(java.security.PublicKey)/publicKey">publicKey</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../net.corda.core.node/-node-info/index.html"><span class="identifier">NodeInfo</span></a><span class="symbol">?</span></code></td>
+<code><span class="keyword">fun </span><span class="identifier">lookup</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.model.NetworkIdentityModel$lookup(net.corda.core.crypto.PublicKeyTree)/publicKeyTree">publicKeyTree</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../net.corda.core.node/-node-info/index.html"><span class="identifier">NodeInfo</span></a><span class="symbol">?</span></code></td>
 </tr>
 </tbody>
 </table>
--- a/docs/build/html/api/net.corda.client.model/-network-identity-model/lookup.html
+++ b/docs/build/html/api/net.corda.client.model/-network-identity-model/lookup.html
@ -7,8 +7,8 @@
 <a href="../index.html">net.corda.client.model</a>&nbsp;/&nbsp;<a href="index.html">NetworkIdentityModel</a>&nbsp;/&nbsp;<a href=".">lookup</a><br/>
 <br/>
 <h1>lookup</h1>
-<a name="net.corda.client.model.NetworkIdentityModel$lookup(java.security.PublicKey)"></a>
-<code><span class="keyword">fun </span><span class="identifier">lookup</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.model.NetworkIdentityModel$lookup(java.security.PublicKey)/publicKey">publicKey</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../net.corda.core.node/-node-info/index.html"><span class="identifier">NodeInfo</span></a><span class="symbol">?</span></code><br/>
+<a name="net.corda.client.model.NetworkIdentityModel$lookup(net.corda.core.crypto.PublicKeyTree)"></a>
+<code><span class="keyword">fun </span><span class="identifier">lookup</span><span class="symbol">(</span><span class="identifier" id="net.corda.client.model.NetworkIdentityModel$lookup(net.corda.core.crypto.PublicKeyTree)/publicKeyTree">publicKeyTree</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../net.corda.core.node/-node-info/index.html"><span class="identifier">NodeInfo</span></a><span class="symbol">?</span></code><br/>
 <br/>
 <br/>
 </BODY>
--- a/docs/build/html/api/net.corda.client.model/-node-monitor-model/client-to-service.html
+++ b/docs/build/html/api/net.corda.client.model/-node-monitor-model/client-to-service.html
@ -8,7 +8,7 @@
 <br/>
 <h1>clientToService</h1>
 <a name="net.corda.client.model.NodeMonitorModel$clientToService"></a>
-<code><span class="keyword">val </span><span class="identifier">clientToService</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-client-to-service-command/index.html"><span class="identifier">ClientToServiceCommand</span></a><span class="symbol">&gt;</span></code><br/>
+<code><span class="keyword">val </span><span class="identifier">clientToService</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span><span class="symbol">&lt;</span><a href="../../net.corda.protocols/-cash-command/index.html"><span class="identifier">CashCommand</span></a><span class="symbol">&gt;</span></code><br/>
 <br/>
 <br/>
 </BODY>
--- a/docs/build/html/api/net.corda.client.model/-node-monitor-model/index.html
+++ b/docs/build/html/api/net.corda.client.model/-node-monitor-model/index.html
@ -30,7 +30,7 @@
 <td>
 <a href="client-to-service.html">clientToService</a></td>
 <td>
-<code><span class="keyword">val </span><span class="identifier">clientToService</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-client-to-service-command/index.html"><span class="identifier">ClientToServiceCommand</span></a><span class="symbol">&gt;</span></code></td>
+<code><span class="keyword">val </span><span class="identifier">clientToService</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span><span class="symbol">&lt;</span><a href="../../net.corda.protocols/-cash-command/index.html"><span class="identifier">CashCommand</span></a><span class="symbol">&gt;</span></code></td>
 </tr>
 <tr>
 <td>
--- a/docs/build/html/api/net.corda.client/-corda-r-p-c-client/index.html
+++ b/docs/build/html/api/net.corda.client/-corda-r-p-c-client/index.html
@ -99,7 +99,7 @@ unfortunately Artemis tends to bury the exception when the password is wrong.</p
 <td>
 <a href="../../net.corda.node.services.messaging/-artemis-messaging-component/parse-key-from-queue-name.html">parseKeyFromQueueName</a></td>
 <td>
-<code><span class="keyword">fun </span><span class="identifier">parseKeyFromQueueName</span><span class="symbol">(</span><span class="identifier" id="net.corda.node.services.messaging.ArtemisMessagingComponent$parseKeyFromQueueName(kotlin.String)/name">name</span><span class="symbol">:</span>&nbsp;<span class="identifier">String</span><span class="symbol">)</span><span class="symbol">: </span><a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a></code></td>
+<code><span class="keyword">fun </span><span class="identifier">parseKeyFromQueueName</span><span class="symbol">(</span><span class="identifier" id="net.corda.node.services.messaging.ArtemisMessagingComponent$parseKeyFromQueueName(kotlin.String)/name">name</span><span class="symbol">:</span>&nbsp;<span class="identifier">String</span><span class="symbol">)</span><span class="symbol">: </span><a href="../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a></code></td>
 </tr>
 <tr>
 <td>
--- a/docs/build/html/api/net.corda.contracts.asset/-cash/-state/-init-.html
+++ b/docs/build/html/api/net.corda.contracts.asset/-cash/-state/-init-.html
@ -7,10 +7,10 @@
 <a href="../../index.html">net.corda.contracts.asset</a>&nbsp;/&nbsp;<a href="../index.html">Cash</a>&nbsp;/&nbsp;<a href="index.html">State</a>&nbsp;/&nbsp;<a href=".">&lt;init&gt;</a><br/>
 <br/>
 <h1>&lt;init&gt;</h1>
-<code><span class="identifier">State</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Cash.State$<init>(net.corda.core.contracts.PartyAndReference, net.corda.core.contracts.Amount((java.util.Currency)), java.security.PublicKey)/deposit">deposit</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-party-and-reference/index.html"><span class="identifier">PartyAndReference</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash.State$<init>(net.corda.core.contracts.PartyAndReference, net.corda.core.contracts.Amount((java.util.Currency)), java.security.PublicKey)/amount">amount</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash.State$<init>(net.corda.core.contracts.PartyAndReference, net.corda.core.contracts.Amount((java.util.Currency)), java.security.PublicKey)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span></code><br/>
+<code><span class="identifier">State</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Cash.State$<init>(net.corda.core.contracts.PartyAndReference, net.corda.core.contracts.Amount((java.util.Currency)), net.corda.core.crypto.PublicKeyTree)/deposit">deposit</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-party-and-reference/index.html"><span class="identifier">PartyAndReference</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash.State$<init>(net.corda.core.contracts.PartyAndReference, net.corda.core.contracts.Amount((java.util.Currency)), net.corda.core.crypto.PublicKeyTree)/amount">amount</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash.State$<init>(net.corda.core.contracts.PartyAndReference, net.corda.core.contracts.Amount((java.util.Currency)), net.corda.core.crypto.PublicKeyTree)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">)</span></code><br/>
 <br/>
 <br/>
-<code><span class="identifier">State</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Cash.State$<init>(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey, kotlin.Int)/amount">amount</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash.State$<init>(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey, kotlin.Int)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash.State$<init>(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey, kotlin.Int)/encumbrance">encumbrance</span><span class="symbol">:</span>&nbsp;<span class="identifier">Int</span><span class="symbol">?</span>&nbsp;<span class="symbol">=</span>&nbsp;null<span class="symbol">)</span></code><br/>
+<code><span class="identifier">State</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Cash.State$<init>(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), net.corda.core.crypto.PublicKeyTree, kotlin.Int)/amount">amount</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash.State$<init>(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), net.corda.core.crypto.PublicKeyTree, kotlin.Int)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash.State$<init>(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), net.corda.core.crypto.PublicKeyTree, kotlin.Int)/encumbrance">encumbrance</span><span class="symbol">:</span>&nbsp;<span class="identifier">Int</span><span class="symbol">?</span>&nbsp;<span class="symbol">=</span>&nbsp;null<span class="symbol">)</span></code><br/>
 <p>A state representing a cash claim against some party.</p>
 <br/>
 <br/>
--- a/docs/build/html/api/net.corda.contracts.asset/-cash/-state/index.html
+++ b/docs/build/html/api/net.corda.contracts.asset/-cash/-state/index.html
@ -18,7 +18,7 @@
 <td>
 <a href="-init-.html">&lt;init&gt;</a></td>
 <td>
-<code><span class="identifier">State</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Cash.State$<init>(net.corda.core.contracts.PartyAndReference, net.corda.core.contracts.Amount((java.util.Currency)), java.security.PublicKey)/deposit">deposit</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-party-and-reference/index.html"><span class="identifier">PartyAndReference</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash.State$<init>(net.corda.core.contracts.PartyAndReference, net.corda.core.contracts.Amount((java.util.Currency)), java.security.PublicKey)/amount">amount</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash.State$<init>(net.corda.core.contracts.PartyAndReference, net.corda.core.contracts.Amount((java.util.Currency)), java.security.PublicKey)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span></code><code><span class="identifier">State</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Cash.State$<init>(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey, kotlin.Int)/amount">amount</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash.State$<init>(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey, kotlin.Int)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash.State$<init>(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey, kotlin.Int)/encumbrance">encumbrance</span><span class="symbol">:</span>&nbsp;<span class="identifier">Int</span><span class="symbol">?</span>&nbsp;<span class="symbol">=</span>&nbsp;null<span class="symbol">)</span></code><p>A state representing a cash claim against some party.</p>
+<code><span class="identifier">State</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Cash.State$<init>(net.corda.core.contracts.PartyAndReference, net.corda.core.contracts.Amount((java.util.Currency)), net.corda.core.crypto.PublicKeyTree)/deposit">deposit</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-party-and-reference/index.html"><span class="identifier">PartyAndReference</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash.State$<init>(net.corda.core.contracts.PartyAndReference, net.corda.core.contracts.Amount((java.util.Currency)), net.corda.core.crypto.PublicKeyTree)/amount">amount</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash.State$<init>(net.corda.core.contracts.PartyAndReference, net.corda.core.contracts.Amount((java.util.Currency)), net.corda.core.crypto.PublicKeyTree)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">)</span></code><code><span class="identifier">State</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Cash.State$<init>(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), net.corda.core.crypto.PublicKeyTree, kotlin.Int)/amount">amount</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash.State$<init>(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), net.corda.core.crypto.PublicKeyTree, kotlin.Int)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash.State$<init>(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), net.corda.core.crypto.PublicKeyTree, kotlin.Int)/encumbrance">encumbrance</span><span class="symbol">:</span>&nbsp;<span class="identifier">Int</span><span class="symbol">?</span>&nbsp;<span class="symbol">=</span>&nbsp;null<span class="symbol">)</span></code><p>A state representing a cash claim against some party.</p>
 </td>
 </tr>
 </tbody>
@ -58,7 +58,7 @@ owner to sign, some (i.e. cash) also require the issuer.</p>
 <td>
 <a href="owner.html">owner</a></td>
 <td>
-<code><span class="keyword">val </span><span class="identifier">owner</span><span class="symbol">: </span><a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a></code><p>There must be a MoveCommand signed by this key to claim the amount.</p>
+<code><span class="keyword">val </span><span class="identifier">owner</span><span class="symbol">: </span><a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a></code><p>There must be a MoveCommand signed by this key to claim the amount.</p>
 </td>
 </tr>
 <tr>
@ -84,7 +84,7 @@ owner to sign, some (i.e. cash) also require the issuer.</p>
 <td>
 <a href="move.html">move</a></td>
 <td>
-<code><span class="keyword">fun </span><span class="identifier">move</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Cash.State$move(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey)/newAmount">newAmount</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash.State$move(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey)/newOwner">newOwner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../../net.corda.core.contracts/-fungible-asset/index.html"><span class="identifier">FungibleAsset</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span></code></td>
+<code><span class="keyword">fun </span><span class="identifier">move</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Cash.State$move(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), net.corda.core.crypto.PublicKeyTree)/newAmount">newAmount</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash.State$move(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), net.corda.core.crypto.PublicKeyTree)/newOwner">newOwner</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../../net.corda.core.contracts/-fungible-asset/index.html"><span class="identifier">FungibleAsset</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span></code></td>
 </tr>
 <tr>
 <td>
@ -103,7 +103,7 @@ owner to sign, some (i.e. cash) also require the issuer.</p>
 <td>
 <a href="with-new-owner.html">withNewOwner</a></td>
 <td>
-<code><span class="keyword">fun </span><span class="identifier">withNewOwner</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Cash.State$withNewOwner(java.security.PublicKey)/newOwner">newOwner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code><p>Copies the underlying data structure, replacing the owner field with this new value and leaving the rest alone</p>
+<code><span class="keyword">fun </span><span class="identifier">withNewOwner</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Cash.State$withNewOwner(net.corda.core.crypto.PublicKeyTree)/newOwner">newOwner</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code><p>Copies the underlying data structure, replacing the owner field with this new value and leaving the rest alone</p>
 </td>
 </tr>
 </tbody>
@ -129,13 +129,13 @@ owner to sign, some (i.e. cash) also require the issuer.</p>
 <td>
 <a href="../../owned by.html">owned by</a></td>
 <td>
-<code><span class="keyword">infix</span> <span class="keyword">fun </span><span class="identifier">State</span><span class="symbol">.</span><span class="identifier">owned by</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset$owned by(net.corda.contracts.asset.Cash.State, java.security.PublicKey)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">State</span></code></td>
+<code><span class="keyword">infix</span> <span class="keyword">fun </span><span class="identifier">State</span><span class="symbol">.</span><span class="identifier">owned by</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset$owned by(net.corda.contracts.asset.Cash.State, net.corda.core.crypto.PublicKeyTree)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">State</span></code></td>
 </tr>
 <tr>
 <td>
 <a href="../../owned-by.html">ownedBy</a></td>
 <td>
-<code><span class="keyword">fun </span><span class="identifier">State</span><span class="symbol">.</span><span class="identifier">ownedBy</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset$ownedBy(net.corda.contracts.asset.Cash.State, java.security.PublicKey)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">State</span></code></td>
+<code><span class="keyword">fun </span><span class="identifier">State</span><span class="symbol">.</span><span class="identifier">ownedBy</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset$ownedBy(net.corda.contracts.asset.Cash.State, net.corda.core.crypto.PublicKeyTree)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">State</span></code></td>
 </tr>
 <tr>
 <td>
--- a/docs/build/html/api/net.corda.contracts.asset/-cash/-state/move.html
+++ b/docs/build/html/api/net.corda.contracts.asset/-cash/-state/move.html
@ -7,8 +7,8 @@
 <a href="../../index.html">net.corda.contracts.asset</a>&nbsp;/&nbsp;<a href="../index.html">Cash</a>&nbsp;/&nbsp;<a href="index.html">State</a>&nbsp;/&nbsp;<a href=".">move</a><br/>
 <br/>
 <h1>move</h1>
-<a name="net.corda.contracts.asset.Cash.State$move(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey)"></a>
-<code><span class="keyword">fun </span><span class="identifier">move</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Cash.State$move(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey)/newAmount">newAmount</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash.State$move(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey)/newOwner">newOwner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../../net.corda.core.contracts/-fungible-asset/index.html"><span class="identifier">FungibleAsset</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span></code><br/>
+<a name="net.corda.contracts.asset.Cash.State$move(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), net.corda.core.crypto.PublicKeyTree)"></a>
+<code><span class="keyword">fun </span><span class="identifier">move</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Cash.State$move(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), net.corda.core.crypto.PublicKeyTree)/newAmount">newAmount</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash.State$move(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), net.corda.core.crypto.PublicKeyTree)/newOwner">newOwner</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../../net.corda.core.contracts/-fungible-asset/index.html"><span class="identifier">FungibleAsset</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span></code><br/>
 <br/>
 <br/>
 </BODY>
--- a/docs/build/html/api/net.corda.contracts.asset/-cash/-state/owner.html
+++ b/docs/build/html/api/net.corda.contracts.asset/-cash/-state/owner.html
@ -8,7 +8,7 @@
 <br/>
 <h1>owner</h1>
 <a name="net.corda.contracts.asset.Cash.State$owner"></a>
-<code><span class="keyword">val </span><span class="identifier">owner</span><span class="symbol">: </span><a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a></code><br/>
+<code><span class="keyword">val </span><span class="identifier">owner</span><span class="symbol">: </span><a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a></code><br/>
 Overrides <a href="../../../net.corda.core.contracts/-fungible-asset/owner.html">FungibleAsset.owner</a><br/>
 <p>There must be a MoveCommand signed by this key to claim the amount.</p>
 <br/>
--- a/docs/build/html/api/net.corda.contracts.asset/-cash/-state/with-new-owner.html
+++ b/docs/build/html/api/net.corda.contracts.asset/-cash/-state/with-new-owner.html
@ -7,8 +7,8 @@
 <a href="../../index.html">net.corda.contracts.asset</a>&nbsp;/&nbsp;<a href="../index.html">Cash</a>&nbsp;/&nbsp;<a href="index.html">State</a>&nbsp;/&nbsp;<a href=".">withNewOwner</a><br/>
 <br/>
 <h1>withNewOwner</h1>
-<a name="net.corda.contracts.asset.Cash.State$withNewOwner(java.security.PublicKey)"></a>
-<code><span class="keyword">fun </span><span class="identifier">withNewOwner</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Cash.State$withNewOwner(java.security.PublicKey)/newOwner">newOwner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code><br/>
+<a name="net.corda.contracts.asset.Cash.State$withNewOwner(net.corda.core.crypto.PublicKeyTree)"></a>
+<code><span class="keyword">fun </span><span class="identifier">withNewOwner</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Cash.State$withNewOwner(net.corda.core.crypto.PublicKeyTree)/newOwner">newOwner</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code><br/>
 Overrides <a href="../../../net.corda.core.contracts/-ownable-state/with-new-owner.html">OwnableState.withNewOwner</a><br/>
 <p>Copies the underlying data structure, replacing the owner field with this new value and leaving the rest alone</p>
 <br/>
--- a/docs/build/html/api/net.corda.contracts.asset/-cash/derive-state.html
+++ b/docs/build/html/api/net.corda.contracts.asset/-cash/derive-state.html
@ -7,8 +7,8 @@
 <a href="../index.html">net.corda.contracts.asset</a>&nbsp;/&nbsp;<a href="index.html">Cash</a>&nbsp;/&nbsp;<a href=".">deriveState</a><br/>
 <br/>
 <h1>deriveState</h1>
-<a name="net.corda.contracts.asset.Cash$deriveState(net.corda.core.contracts.TransactionState((net.corda.contracts.asset.Cash.State)), net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey)"></a>
-<code><span class="keyword">fun </span><span class="identifier">deriveState</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Cash$deriveState(net.corda.core.contracts.TransactionState((net.corda.contracts.asset.Cash.State)), net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey)/txState">txState</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.contracts/-transaction-state/index.html"><span class="identifier">TransactionState</span></a><span class="symbol">&lt;</span><a href="-state/index.html"><span class="identifier">State</span></a><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$deriveState(net.corda.core.contracts.TransactionState((net.corda.contracts.asset.Cash.State)), net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey)/amount">amount</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$deriveState(net.corda.core.contracts.TransactionState((net.corda.contracts.asset.Cash.State)), net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../net.corda.core.contracts/-transaction-state/index.html"><span class="identifier">TransactionState</span></a><span class="symbol">&lt;</span><a href="-state/index.html"><span class="identifier">State</span></a><span class="symbol">&gt;</span></code><br/>
+<a name="net.corda.contracts.asset.Cash$deriveState(net.corda.core.contracts.TransactionState((net.corda.contracts.asset.Cash.State)), net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), net.corda.core.crypto.PublicKeyTree)"></a>
+<code><span class="keyword">fun </span><span class="identifier">deriveState</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Cash$deriveState(net.corda.core.contracts.TransactionState((net.corda.contracts.asset.Cash.State)), net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), net.corda.core.crypto.PublicKeyTree)/txState">txState</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.contracts/-transaction-state/index.html"><span class="identifier">TransactionState</span></a><span class="symbol">&lt;</span><a href="-state/index.html"><span class="identifier">State</span></a><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$deriveState(net.corda.core.contracts.TransactionState((net.corda.contracts.asset.Cash.State)), net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), net.corda.core.crypto.PublicKeyTree)/amount">amount</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$deriveState(net.corda.core.contracts.TransactionState((net.corda.contracts.asset.Cash.State)), net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), net.corda.core.crypto.PublicKeyTree)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../net.corda.core.contracts/-transaction-state/index.html"><span class="identifier">TransactionState</span></a><span class="symbol">&lt;</span><a href="-state/index.html"><span class="identifier">State</span></a><span class="symbol">&gt;</span></code><br/>
 <p>Derive a new transaction state based on the given example, with amount and owner modified. This allows concrete
 implementations to have fields in their state which we dont know about here, and we simply leave them untouched
 when sending out "change" from spending/exiting.</p>
--- a/docs/build/html/api/net.corda.contracts.asset/-cash/generate-issue.html
+++ b/docs/build/html/api/net.corda.contracts.asset/-cash/generate-issue.html
@ -7,13 +7,13 @@
 <a href="../index.html">net.corda.contracts.asset</a>&nbsp;/&nbsp;<a href="index.html">Cash</a>&nbsp;/&nbsp;<a href=".">generateIssue</a><br/>
 <br/>
 <h1>generateIssue</h1>
-<a name="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((java.util.Currency)), kotlin.Long, java.security.PublicKey, net.corda.core.crypto.Party)"></a>
-<code><span class="keyword">fun </span><span class="identifier">generateIssue</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((java.util.Currency)), kotlin.Long, java.security.PublicKey, net.corda.core.crypto.Party)/tx">tx</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.transactions/-transaction-builder/index.html"><span class="identifier">TransactionBuilder</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((java.util.Currency)), kotlin.Long, java.security.PublicKey, net.corda.core.crypto.Party)/tokenDef">tokenDef</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((java.util.Currency)), kotlin.Long, java.security.PublicKey, net.corda.core.crypto.Party)/pennies">pennies</span><span class="symbol">:</span>&nbsp;<span class="identifier">Long</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((java.util.Currency)), kotlin.Long, java.security.PublicKey, net.corda.core.crypto.Party)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((java.util.Currency)), kotlin.Long, java.security.PublicKey, net.corda.core.crypto.Party)/notary">notary</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code><br/>
+<a name="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((java.util.Currency)), kotlin.Long, net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)"></a>
+<code><span class="keyword">fun </span><span class="identifier">generateIssue</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((java.util.Currency)), kotlin.Long, net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/tx">tx</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.transactions/-transaction-builder/index.html"><span class="identifier">TransactionBuilder</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((java.util.Currency)), kotlin.Long, net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/tokenDef">tokenDef</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((java.util.Currency)), kotlin.Long, net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/pennies">pennies</span><span class="symbol">:</span>&nbsp;<span class="identifier">Long</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((java.util.Currency)), kotlin.Long, net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((java.util.Currency)), kotlin.Long, net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/notary">notary</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code><br/>
 <p>Puts together an issuance transaction from the given template, that starts out being owned by the given pubkey.</p>
 <br/>
 <br/>
-<a name="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey, net.corda.core.crypto.Party)"></a>
-<code><span class="keyword">fun </span><span class="identifier">generateIssue</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey, net.corda.core.crypto.Party)/tx">tx</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.transactions/-transaction-builder/index.html"><span class="identifier">TransactionBuilder</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey, net.corda.core.crypto.Party)/amount">amount</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey, net.corda.core.crypto.Party)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey, net.corda.core.crypto.Party)/notary">notary</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code><br/>
+<a name="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)"></a>
+<code><span class="keyword">fun </span><span class="identifier">generateIssue</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/tx">tx</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.transactions/-transaction-builder/index.html"><span class="identifier">TransactionBuilder</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/amount">amount</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/notary">notary</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code><br/>
 <p>Puts together an issuance transaction for the specified amount that starts out being owned by the given pubkey.</p>
 <br/>
 <br/>
--- a/docs/build/html/api/net.corda.contracts.asset/-cash/index.html
+++ b/docs/build/html/api/net.corda.contracts.asset/-cash/index.html
@ -85,7 +85,7 @@ the same transaction.</p>
 <td>
 <a href="derive-state.html">deriveState</a></td>
 <td>
-<code><span class="keyword">fun </span><span class="identifier">deriveState</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Cash$deriveState(net.corda.core.contracts.TransactionState((net.corda.contracts.asset.Cash.State)), net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey)/txState">txState</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.contracts/-transaction-state/index.html"><span class="identifier">TransactionState</span></a><span class="symbol">&lt;</span><a href="-state/index.html"><span class="identifier">State</span></a><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$deriveState(net.corda.core.contracts.TransactionState((net.corda.contracts.asset.Cash.State)), net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey)/amount">amount</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$deriveState(net.corda.core.contracts.TransactionState((net.corda.contracts.asset.Cash.State)), net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../net.corda.core.contracts/-transaction-state/index.html"><span class="identifier">TransactionState</span></a><span class="symbol">&lt;</span><a href="-state/index.html"><span class="identifier">State</span></a><span class="symbol">&gt;</span></code><p>Derive a new transaction state based on the given example, with amount and owner modified. This allows concrete
+<code><span class="keyword">fun </span><span class="identifier">deriveState</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Cash$deriveState(net.corda.core.contracts.TransactionState((net.corda.contracts.asset.Cash.State)), net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), net.corda.core.crypto.PublicKeyTree)/txState">txState</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.contracts/-transaction-state/index.html"><span class="identifier">TransactionState</span></a><span class="symbol">&lt;</span><a href="-state/index.html"><span class="identifier">State</span></a><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$deriveState(net.corda.core.contracts.TransactionState((net.corda.contracts.asset.Cash.State)), net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), net.corda.core.crypto.PublicKeyTree)/amount">amount</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$deriveState(net.corda.core.contracts.TransactionState((net.corda.contracts.asset.Cash.State)), net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), net.corda.core.crypto.PublicKeyTree)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../net.corda.core.contracts/-transaction-state/index.html"><span class="identifier">TransactionState</span></a><span class="symbol">&lt;</span><a href="-state/index.html"><span class="identifier">State</span></a><span class="symbol">&gt;</span></code><p>Derive a new transaction state based on the given example, with amount and owner modified. This allows concrete
 implementations to have fields in their state which we dont know about here, and we simply leave them untouched
 when sending out "change" from spending/exiting.</p>
 </td>
@ -106,8 +106,8 @@ when sending out "change" from spending/exiting.</p>
 <td>
 <a href="generate-issue.html">generateIssue</a></td>
 <td>
-<code><span class="keyword">fun </span><span class="identifier">generateIssue</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((java.util.Currency)), kotlin.Long, java.security.PublicKey, net.corda.core.crypto.Party)/tx">tx</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.transactions/-transaction-builder/index.html"><span class="identifier">TransactionBuilder</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((java.util.Currency)), kotlin.Long, java.security.PublicKey, net.corda.core.crypto.Party)/tokenDef">tokenDef</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((java.util.Currency)), kotlin.Long, java.security.PublicKey, net.corda.core.crypto.Party)/pennies">pennies</span><span class="symbol">:</span>&nbsp;<span class="identifier">Long</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((java.util.Currency)), kotlin.Long, java.security.PublicKey, net.corda.core.crypto.Party)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((java.util.Currency)), kotlin.Long, java.security.PublicKey, net.corda.core.crypto.Party)/notary">notary</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code><p>Puts together an issuance transaction from the given template, that starts out being owned by the given pubkey.</p>
-<code><span class="keyword">fun </span><span class="identifier">generateIssue</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey, net.corda.core.crypto.Party)/tx">tx</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.transactions/-transaction-builder/index.html"><span class="identifier">TransactionBuilder</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey, net.corda.core.crypto.Party)/amount">amount</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey, net.corda.core.crypto.Party)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey, net.corda.core.crypto.Party)/notary">notary</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code><p>Puts together an issuance transaction for the specified amount that starts out being owned by the given pubkey.</p>
+<code><span class="keyword">fun </span><span class="identifier">generateIssue</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((java.util.Currency)), kotlin.Long, net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/tx">tx</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.transactions/-transaction-builder/index.html"><span class="identifier">TransactionBuilder</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((java.util.Currency)), kotlin.Long, net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/tokenDef">tokenDef</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((java.util.Currency)), kotlin.Long, net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/pennies">pennies</span><span class="symbol">:</span>&nbsp;<span class="identifier">Long</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((java.util.Currency)), kotlin.Long, net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((java.util.Currency)), kotlin.Long, net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/notary">notary</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code><p>Puts together an issuance transaction from the given template, that starts out being owned by the given pubkey.</p>
+<code><span class="keyword">fun </span><span class="identifier">generateIssue</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/tx">tx</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.transactions/-transaction-builder/index.html"><span class="identifier">TransactionBuilder</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/amount">amount</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Cash$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((java.util.Currency)))), net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/notary">notary</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code><p>Puts together an issuance transaction for the specified amount that starts out being owned by the given pubkey.</p>
 </td>
 </tr>
 <tr>
--- a/docs/build/html/api/net.corda.contracts.asset/-commodity-contract/-state/-init-.html
+++ b/docs/build/html/api/net.corda.contracts.asset/-commodity-contract/-state/-init-.html
@ -7,10 +7,10 @@
 <a href="../../index.html">net.corda.contracts.asset</a>&nbsp;/&nbsp;<a href="../index.html">CommodityContract</a>&nbsp;/&nbsp;<a href="index.html">State</a>&nbsp;/&nbsp;<a href=".">&lt;init&gt;</a><br/>
 <br/>
 <h1>&lt;init&gt;</h1>
-<code><span class="identifier">State</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.CommodityContract.State$<init>(net.corda.core.contracts.PartyAndReference, net.corda.core.contracts.Amount((net.corda.core.contracts.Commodity)), java.security.PublicKey)/deposit">deposit</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-party-and-reference/index.html"><span class="identifier">PartyAndReference</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract.State$<init>(net.corda.core.contracts.PartyAndReference, net.corda.core.contracts.Amount((net.corda.core.contracts.Commodity)), java.security.PublicKey)/amount">amount</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-commodity/index.html"><span class="identifier">Commodity</span></a><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract.State$<init>(net.corda.core.contracts.PartyAndReference, net.corda.core.contracts.Amount((net.corda.core.contracts.Commodity)), java.security.PublicKey)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span></code><br/>
+<code><span class="identifier">State</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.CommodityContract.State$<init>(net.corda.core.contracts.PartyAndReference, net.corda.core.contracts.Amount((net.corda.core.contracts.Commodity)), net.corda.core.crypto.PublicKeyTree)/deposit">deposit</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-party-and-reference/index.html"><span class="identifier">PartyAndReference</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract.State$<init>(net.corda.core.contracts.PartyAndReference, net.corda.core.contracts.Amount((net.corda.core.contracts.Commodity)), net.corda.core.crypto.PublicKeyTree)/amount">amount</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-commodity/index.html"><span class="identifier">Commodity</span></a><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract.State$<init>(net.corda.core.contracts.PartyAndReference, net.corda.core.contracts.Amount((net.corda.core.contracts.Commodity)), net.corda.core.crypto.PublicKeyTree)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">)</span></code><br/>
 <br/>
 <br/>
-<code><span class="identifier">State</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.CommodityContract.State$<init>(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), java.security.PublicKey)/amount">amount</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-commodity/index.html"><span class="identifier">Commodity</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract.State$<init>(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), java.security.PublicKey)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span></code><br/>
+<code><span class="identifier">State</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.CommodityContract.State$<init>(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), net.corda.core.crypto.PublicKeyTree)/amount">amount</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-commodity/index.html"><span class="identifier">Commodity</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract.State$<init>(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), net.corda.core.crypto.PublicKeyTree)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">)</span></code><br/>
 <p>A state representing a commodity claim against some party</p>
 <br/>
 <br/>
--- a/docs/build/html/api/net.corda.contracts.asset/-commodity-contract/-state/exit-keys.html
+++ b/docs/build/html/api/net.corda.contracts.asset/-commodity-contract/-state/exit-keys.html
@ -8,7 +8,7 @@
 <br/>
 <h1>exitKeys</h1>
 <a name="net.corda.contracts.asset.CommodityContract.State$exitKeys"></a>
-<code><span class="keyword">val </span><span class="identifier">exitKeys</span><span class="symbol">: </span><span class="identifier">MutableSet</span><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">&gt;</span></code><br/>
+<code><span class="keyword">val </span><span class="identifier">exitKeys</span><span class="symbol">: </span><span class="identifier">MutableSet</span><span class="symbol">&lt;</span><a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">&gt;</span></code><br/>
 Overrides <a href="../../../net.corda.core.contracts/-fungible-asset/exit-keys.html">FungibleAsset.exitKeys</a><br/>
 <p>There must be an ExitCommand signed by these keys to destroy the amount. While all states require their
 owner to sign, some (i.e. cash) also require the issuer.</p>
--- a/docs/build/html/api/net.corda.contracts.asset/-commodity-contract/-state/index.html
+++ b/docs/build/html/api/net.corda.contracts.asset/-commodity-contract/-state/index.html
@ -18,7 +18,7 @@
 <td>
 <a href="-init-.html">&lt;init&gt;</a></td>
 <td>
-<code><span class="identifier">State</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.CommodityContract.State$<init>(net.corda.core.contracts.PartyAndReference, net.corda.core.contracts.Amount((net.corda.core.contracts.Commodity)), java.security.PublicKey)/deposit">deposit</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-party-and-reference/index.html"><span class="identifier">PartyAndReference</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract.State$<init>(net.corda.core.contracts.PartyAndReference, net.corda.core.contracts.Amount((net.corda.core.contracts.Commodity)), java.security.PublicKey)/amount">amount</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-commodity/index.html"><span class="identifier">Commodity</span></a><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract.State$<init>(net.corda.core.contracts.PartyAndReference, net.corda.core.contracts.Amount((net.corda.core.contracts.Commodity)), java.security.PublicKey)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span></code><code><span class="identifier">State</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.CommodityContract.State$<init>(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), java.security.PublicKey)/amount">amount</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-commodity/index.html"><span class="identifier">Commodity</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract.State$<init>(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), java.security.PublicKey)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span></code><p>A state representing a commodity claim against some party</p>
+<code><span class="identifier">State</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.CommodityContract.State$<init>(net.corda.core.contracts.PartyAndReference, net.corda.core.contracts.Amount((net.corda.core.contracts.Commodity)), net.corda.core.crypto.PublicKeyTree)/deposit">deposit</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-party-and-reference/index.html"><span class="identifier">PartyAndReference</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract.State$<init>(net.corda.core.contracts.PartyAndReference, net.corda.core.contracts.Amount((net.corda.core.contracts.Commodity)), net.corda.core.crypto.PublicKeyTree)/amount">amount</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-commodity/index.html"><span class="identifier">Commodity</span></a><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract.State$<init>(net.corda.core.contracts.PartyAndReference, net.corda.core.contracts.Amount((net.corda.core.contracts.Commodity)), net.corda.core.crypto.PublicKeyTree)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">)</span></code><code><span class="identifier">State</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.CommodityContract.State$<init>(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), net.corda.core.crypto.PublicKeyTree)/amount">amount</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-commodity/index.html"><span class="identifier">Commodity</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract.State$<init>(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), net.corda.core.crypto.PublicKeyTree)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">)</span></code><p>A state representing a commodity claim against some party</p>
 </td>
 </tr>
 </tbody>
@ -43,7 +43,7 @@
 <td>
 <a href="exit-keys.html">exitKeys</a></td>
 <td>
-<code><span class="keyword">val </span><span class="identifier">exitKeys</span><span class="symbol">: </span><span class="identifier">MutableSet</span><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">&gt;</span></code><p>There must be an ExitCommand signed by these keys to destroy the amount. While all states require their
+<code><span class="keyword">val </span><span class="identifier">exitKeys</span><span class="symbol">: </span><span class="identifier">MutableSet</span><span class="symbol">&lt;</span><a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">&gt;</span></code><p>There must be an ExitCommand signed by these keys to destroy the amount. While all states require their
 owner to sign, some (i.e. cash) also require the issuer.</p>
 </td>
 </tr>
@ -51,7 +51,7 @@ owner to sign, some (i.e. cash) also require the issuer.</p>
 <td>
 <a href="owner.html">owner</a></td>
 <td>
-<code><span class="keyword">val </span><span class="identifier">owner</span><span class="symbol">: </span><a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a></code><p>There must be a MoveCommand signed by this key to claim the amount</p>
+<code><span class="keyword">val </span><span class="identifier">owner</span><span class="symbol">: </span><a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a></code><p>There must be a MoveCommand signed by this key to claim the amount</p>
 </td>
 </tr>
 <tr>
@ -70,7 +70,7 @@ owner to sign, some (i.e. cash) also require the issuer.</p>
 <td>
 <a href="move.html">move</a></td>
 <td>
-<code><span class="keyword">fun </span><span class="identifier">move</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.CommodityContract.State$move(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), java.security.PublicKey)/newAmount">newAmount</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-commodity/index.html"><span class="identifier">Commodity</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract.State$move(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), java.security.PublicKey)/newOwner">newOwner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../../net.corda.core.contracts/-fungible-asset/index.html"><span class="identifier">FungibleAsset</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-commodity/index.html"><span class="identifier">Commodity</span></a><span class="symbol">&gt;</span></code></td>
+<code><span class="keyword">fun </span><span class="identifier">move</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.CommodityContract.State$move(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), net.corda.core.crypto.PublicKeyTree)/newAmount">newAmount</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-commodity/index.html"><span class="identifier">Commodity</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract.State$move(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), net.corda.core.crypto.PublicKeyTree)/newOwner">newOwner</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../../net.corda.core.contracts/-fungible-asset/index.html"><span class="identifier">FungibleAsset</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-commodity/index.html"><span class="identifier">Commodity</span></a><span class="symbol">&gt;</span></code></td>
 </tr>
 <tr>
 <td>
@ -82,7 +82,7 @@ owner to sign, some (i.e. cash) also require the issuer.</p>
 <td>
 <a href="with-new-owner.html">withNewOwner</a></td>
 <td>
-<code><span class="keyword">fun </span><span class="identifier">withNewOwner</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.CommodityContract.State$withNewOwner(java.security.PublicKey)/newOwner">newOwner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code><p>Copies the underlying data structure, replacing the owner field with this new value and leaving the rest alone</p>
+<code><span class="keyword">fun </span><span class="identifier">withNewOwner</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.CommodityContract.State$withNewOwner(net.corda.core.crypto.PublicKeyTree)/newOwner">newOwner</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code><p>Copies the underlying data structure, replacing the owner field with this new value and leaving the rest alone</p>
 </td>
 </tr>
 </tbody>
--- a/docs/build/html/api/net.corda.contracts.asset/-commodity-contract/-state/move.html
+++ b/docs/build/html/api/net.corda.contracts.asset/-commodity-contract/-state/move.html
@ -7,8 +7,8 @@
 <a href="../../index.html">net.corda.contracts.asset</a>&nbsp;/&nbsp;<a href="../index.html">CommodityContract</a>&nbsp;/&nbsp;<a href="index.html">State</a>&nbsp;/&nbsp;<a href=".">move</a><br/>
 <br/>
 <h1>move</h1>
-<a name="net.corda.contracts.asset.CommodityContract.State$move(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), java.security.PublicKey)"></a>
-<code><span class="keyword">fun </span><span class="identifier">move</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.CommodityContract.State$move(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), java.security.PublicKey)/newAmount">newAmount</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-commodity/index.html"><span class="identifier">Commodity</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract.State$move(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), java.security.PublicKey)/newOwner">newOwner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../../net.corda.core.contracts/-fungible-asset/index.html"><span class="identifier">FungibleAsset</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-commodity/index.html"><span class="identifier">Commodity</span></a><span class="symbol">&gt;</span></code><br/>
+<a name="net.corda.contracts.asset.CommodityContract.State$move(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), net.corda.core.crypto.PublicKeyTree)"></a>
+<code><span class="keyword">fun </span><span class="identifier">move</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.CommodityContract.State$move(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), net.corda.core.crypto.PublicKeyTree)/newAmount">newAmount</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-commodity/index.html"><span class="identifier">Commodity</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract.State$move(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), net.corda.core.crypto.PublicKeyTree)/newOwner">newOwner</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../../net.corda.core.contracts/-fungible-asset/index.html"><span class="identifier">FungibleAsset</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-commodity/index.html"><span class="identifier">Commodity</span></a><span class="symbol">&gt;</span></code><br/>
 <br/>
 <br/>
 </BODY>
--- a/docs/build/html/api/net.corda.contracts.asset/-commodity-contract/-state/owner.html
+++ b/docs/build/html/api/net.corda.contracts.asset/-commodity-contract/-state/owner.html
@ -8,7 +8,7 @@
 <br/>
 <h1>owner</h1>
 <a name="net.corda.contracts.asset.CommodityContract.State$owner"></a>
-<code><span class="keyword">val </span><span class="identifier">owner</span><span class="symbol">: </span><a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a></code><br/>
+<code><span class="keyword">val </span><span class="identifier">owner</span><span class="symbol">: </span><a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a></code><br/>
 Overrides <a href="../../../net.corda.core.contracts/-fungible-asset/owner.html">FungibleAsset.owner</a><br/>
 <p>There must be a MoveCommand signed by this key to claim the amount</p>
 <br/>
--- a/docs/build/html/api/net.corda.contracts.asset/-commodity-contract/-state/with-new-owner.html
+++ b/docs/build/html/api/net.corda.contracts.asset/-commodity-contract/-state/with-new-owner.html
@ -7,8 +7,8 @@
 <a href="../../index.html">net.corda.contracts.asset</a>&nbsp;/&nbsp;<a href="../index.html">CommodityContract</a>&nbsp;/&nbsp;<a href="index.html">State</a>&nbsp;/&nbsp;<a href=".">withNewOwner</a><br/>
 <br/>
 <h1>withNewOwner</h1>
-<a name="net.corda.contracts.asset.CommodityContract.State$withNewOwner(java.security.PublicKey)"></a>
-<code><span class="keyword">fun </span><span class="identifier">withNewOwner</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.CommodityContract.State$withNewOwner(java.security.PublicKey)/newOwner">newOwner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code><br/>
+<a name="net.corda.contracts.asset.CommodityContract.State$withNewOwner(net.corda.core.crypto.PublicKeyTree)"></a>
+<code><span class="keyword">fun </span><span class="identifier">withNewOwner</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.CommodityContract.State$withNewOwner(net.corda.core.crypto.PublicKeyTree)/newOwner">newOwner</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code><br/>
 Overrides <a href="../../../net.corda.core.contracts/-ownable-state/with-new-owner.html">OwnableState.withNewOwner</a><br/>
 <p>Copies the underlying data structure, replacing the owner field with this new value and leaving the rest alone</p>
 <br/>
--- a/docs/build/html/api/net.corda.contracts.asset/-commodity-contract/derive-state.html
+++ b/docs/build/html/api/net.corda.contracts.asset/-commodity-contract/derive-state.html
@ -7,8 +7,8 @@
 <a href="../index.html">net.corda.contracts.asset</a>&nbsp;/&nbsp;<a href="index.html">CommodityContract</a>&nbsp;/&nbsp;<a href=".">deriveState</a><br/>
 <br/>
 <h1>deriveState</h1>
-<a name="net.corda.contracts.asset.CommodityContract$deriveState(net.corda.core.contracts.TransactionState((net.corda.contracts.asset.CommodityContract.State)), net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), java.security.PublicKey)"></a>
-<code><span class="keyword">fun </span><span class="identifier">deriveState</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$deriveState(net.corda.core.contracts.TransactionState((net.corda.contracts.asset.CommodityContract.State)), net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), java.security.PublicKey)/txState">txState</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.contracts/-transaction-state/index.html"><span class="identifier">TransactionState</span></a><span class="symbol">&lt;</span><a href="-state/index.html"><span class="identifier">State</span></a><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$deriveState(net.corda.core.contracts.TransactionState((net.corda.contracts.asset.CommodityContract.State)), net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), java.security.PublicKey)/amount">amount</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-commodity/index.html"><span class="identifier">Commodity</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$deriveState(net.corda.core.contracts.TransactionState((net.corda.contracts.asset.CommodityContract.State)), net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), java.security.PublicKey)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../net.corda.core.contracts/-transaction-state/index.html"><span class="identifier">TransactionState</span></a><span class="symbol">&lt;</span><a href="-state/index.html"><span class="identifier">State</span></a><span class="symbol">&gt;</span></code><br/>
+<a name="net.corda.contracts.asset.CommodityContract$deriveState(net.corda.core.contracts.TransactionState((net.corda.contracts.asset.CommodityContract.State)), net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), net.corda.core.crypto.PublicKeyTree)"></a>
+<code><span class="keyword">fun </span><span class="identifier">deriveState</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$deriveState(net.corda.core.contracts.TransactionState((net.corda.contracts.asset.CommodityContract.State)), net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), net.corda.core.crypto.PublicKeyTree)/txState">txState</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.contracts/-transaction-state/index.html"><span class="identifier">TransactionState</span></a><span class="symbol">&lt;</span><a href="-state/index.html"><span class="identifier">State</span></a><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$deriveState(net.corda.core.contracts.TransactionState((net.corda.contracts.asset.CommodityContract.State)), net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), net.corda.core.crypto.PublicKeyTree)/amount">amount</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-commodity/index.html"><span class="identifier">Commodity</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$deriveState(net.corda.core.contracts.TransactionState((net.corda.contracts.asset.CommodityContract.State)), net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), net.corda.core.crypto.PublicKeyTree)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../net.corda.core.contracts/-transaction-state/index.html"><span class="identifier">TransactionState</span></a><span class="symbol">&lt;</span><a href="-state/index.html"><span class="identifier">State</span></a><span class="symbol">&gt;</span></code><br/>
 <p>Derive a new transaction state based on the given example, with amount and owner modified. This allows concrete
 implementations to have fields in their state which we dont know about here, and we simply leave them untouched
 when sending out "change" from spending/exiting.</p>
--- a/docs/build/html/api/net.corda.contracts.asset/-commodity-contract/generate-issue.html
+++ b/docs/build/html/api/net.corda.contracts.asset/-commodity-contract/generate-issue.html
@ -7,13 +7,13 @@
 <a href="../index.html">net.corda.contracts.asset</a>&nbsp;/&nbsp;<a href="index.html">CommodityContract</a>&nbsp;/&nbsp;<a href=".">generateIssue</a><br/>
 <br/>
 <h1>generateIssue</h1>
-<a name="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)), kotlin.Long, java.security.PublicKey, net.corda.core.crypto.Party)"></a>
-<code><span class="keyword">fun </span><span class="identifier">generateIssue</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)), kotlin.Long, java.security.PublicKey, net.corda.core.crypto.Party)/tx">tx</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.transactions/-transaction-builder/index.html"><span class="identifier">TransactionBuilder</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)), kotlin.Long, java.security.PublicKey, net.corda.core.crypto.Party)/tokenDef">tokenDef</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-commodity/index.html"><span class="identifier">Commodity</span></a><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)), kotlin.Long, java.security.PublicKey, net.corda.core.crypto.Party)/pennies">pennies</span><span class="symbol">:</span>&nbsp;<span class="identifier">Long</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)), kotlin.Long, java.security.PublicKey, net.corda.core.crypto.Party)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)), kotlin.Long, java.security.PublicKey, net.corda.core.crypto.Party)/notary">notary</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code><br/>
+<a name="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)), kotlin.Long, net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)"></a>
+<code><span class="keyword">fun </span><span class="identifier">generateIssue</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)), kotlin.Long, net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/tx">tx</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.transactions/-transaction-builder/index.html"><span class="identifier">TransactionBuilder</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)), kotlin.Long, net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/tokenDef">tokenDef</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-commodity/index.html"><span class="identifier">Commodity</span></a><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)), kotlin.Long, net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/pennies">pennies</span><span class="symbol">:</span>&nbsp;<span class="identifier">Long</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)), kotlin.Long, net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)), kotlin.Long, net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/notary">notary</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code><br/>
 <p>Puts together an issuance transaction from the given template, that starts out being owned by the given pubkey.</p>
 <br/>
 <br/>
-<a name="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), java.security.PublicKey, net.corda.core.crypto.Party)"></a>
-<code><span class="keyword">fun </span><span class="identifier">generateIssue</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), java.security.PublicKey, net.corda.core.crypto.Party)/tx">tx</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.transactions/-transaction-builder/index.html"><span class="identifier">TransactionBuilder</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), java.security.PublicKey, net.corda.core.crypto.Party)/amount">amount</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-commodity/index.html"><span class="identifier">Commodity</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), java.security.PublicKey, net.corda.core.crypto.Party)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), java.security.PublicKey, net.corda.core.crypto.Party)/notary">notary</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code><br/>
+<a name="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)"></a>
+<code><span class="keyword">fun </span><span class="identifier">generateIssue</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/tx">tx</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.transactions/-transaction-builder/index.html"><span class="identifier">TransactionBuilder</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/amount">amount</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-commodity/index.html"><span class="identifier">Commodity</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/notary">notary</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code><br/>
 <p>Puts together an issuance transaction for the specified amount that starts out being owned by the given pubkey.</p>
 <br/>
 <br/>
--- a/docs/build/html/api/net.corda.contracts.asset/-commodity-contract/index.html
+++ b/docs/build/html/api/net.corda.contracts.asset/-commodity-contract/index.html
@ -85,7 +85,7 @@ internal accounting by the issuer (it might be, for example, a warehouse and/or
 <td>
 <a href="derive-state.html">deriveState</a></td>
 <td>
-<code><span class="keyword">fun </span><span class="identifier">deriveState</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$deriveState(net.corda.core.contracts.TransactionState((net.corda.contracts.asset.CommodityContract.State)), net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), java.security.PublicKey)/txState">txState</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.contracts/-transaction-state/index.html"><span class="identifier">TransactionState</span></a><span class="symbol">&lt;</span><a href="-state/index.html"><span class="identifier">State</span></a><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$deriveState(net.corda.core.contracts.TransactionState((net.corda.contracts.asset.CommodityContract.State)), net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), java.security.PublicKey)/amount">amount</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-commodity/index.html"><span class="identifier">Commodity</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$deriveState(net.corda.core.contracts.TransactionState((net.corda.contracts.asset.CommodityContract.State)), net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), java.security.PublicKey)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../net.corda.core.contracts/-transaction-state/index.html"><span class="identifier">TransactionState</span></a><span class="symbol">&lt;</span><a href="-state/index.html"><span class="identifier">State</span></a><span class="symbol">&gt;</span></code><p>Derive a new transaction state based on the given example, with amount and owner modified. This allows concrete
+<code><span class="keyword">fun </span><span class="identifier">deriveState</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$deriveState(net.corda.core.contracts.TransactionState((net.corda.contracts.asset.CommodityContract.State)), net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), net.corda.core.crypto.PublicKeyTree)/txState">txState</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.contracts/-transaction-state/index.html"><span class="identifier">TransactionState</span></a><span class="symbol">&lt;</span><a href="-state/index.html"><span class="identifier">State</span></a><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$deriveState(net.corda.core.contracts.TransactionState((net.corda.contracts.asset.CommodityContract.State)), net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), net.corda.core.crypto.PublicKeyTree)/amount">amount</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-commodity/index.html"><span class="identifier">Commodity</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$deriveState(net.corda.core.contracts.TransactionState((net.corda.contracts.asset.CommodityContract.State)), net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), net.corda.core.crypto.PublicKeyTree)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../net.corda.core.contracts/-transaction-state/index.html"><span class="identifier">TransactionState</span></a><span class="symbol">&lt;</span><a href="-state/index.html"><span class="identifier">State</span></a><span class="symbol">&gt;</span></code><p>Derive a new transaction state based on the given example, with amount and owner modified. This allows concrete
 implementations to have fields in their state which we dont know about here, and we simply leave them untouched
 when sending out "change" from spending/exiting.</p>
 </td>
@ -106,8 +106,8 @@ when sending out "change" from spending/exiting.</p>
 <td>
 <a href="generate-issue.html">generateIssue</a></td>
 <td>
-<code><span class="keyword">fun </span><span class="identifier">generateIssue</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)), kotlin.Long, java.security.PublicKey, net.corda.core.crypto.Party)/tx">tx</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.transactions/-transaction-builder/index.html"><span class="identifier">TransactionBuilder</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)), kotlin.Long, java.security.PublicKey, net.corda.core.crypto.Party)/tokenDef">tokenDef</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-commodity/index.html"><span class="identifier">Commodity</span></a><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)), kotlin.Long, java.security.PublicKey, net.corda.core.crypto.Party)/pennies">pennies</span><span class="symbol">:</span>&nbsp;<span class="identifier">Long</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)), kotlin.Long, java.security.PublicKey, net.corda.core.crypto.Party)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)), kotlin.Long, java.security.PublicKey, net.corda.core.crypto.Party)/notary">notary</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code><p>Puts together an issuance transaction from the given template, that starts out being owned by the given pubkey.</p>
-<code><span class="keyword">fun </span><span class="identifier">generateIssue</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), java.security.PublicKey, net.corda.core.crypto.Party)/tx">tx</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.transactions/-transaction-builder/index.html"><span class="identifier">TransactionBuilder</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), java.security.PublicKey, net.corda.core.crypto.Party)/amount">amount</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-commodity/index.html"><span class="identifier">Commodity</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), java.security.PublicKey, net.corda.core.crypto.Party)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), java.security.PublicKey, net.corda.core.crypto.Party)/notary">notary</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code><p>Puts together an issuance transaction for the specified amount that starts out being owned by the given pubkey.</p>
+<code><span class="keyword">fun </span><span class="identifier">generateIssue</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)), kotlin.Long, net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/tx">tx</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.transactions/-transaction-builder/index.html"><span class="identifier">TransactionBuilder</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)), kotlin.Long, net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/tokenDef">tokenDef</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-commodity/index.html"><span class="identifier">Commodity</span></a><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)), kotlin.Long, net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/pennies">pennies</span><span class="symbol">:</span>&nbsp;<span class="identifier">Long</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)), kotlin.Long, net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)), kotlin.Long, net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/notary">notary</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code><p>Puts together an issuance transaction from the given template, that starts out being owned by the given pubkey.</p>
+<code><span class="keyword">fun </span><span class="identifier">generateIssue</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/tx">tx</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.transactions/-transaction-builder/index.html"><span class="identifier">TransactionBuilder</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/amount">amount</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="../../net.corda.core.contracts/-commodity/index.html"><span class="identifier">Commodity</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.CommodityContract$generateIssue(net.corda.core.transactions.TransactionBuilder, net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.core.contracts.Commodity)))), net.corda.core.crypto.PublicKeyTree, net.corda.core.crypto.Party)/notary">notary</span><span class="symbol">:</span>&nbsp;<a href="../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code><p>Puts together an issuance transaction for the specified amount that starts out being owned by the given pubkey.</p>
 </td>
 </tr>
 <tr>
--- a/docs/build/html/api/net.corda.contracts.asset/-obligation/-state/-init-.html
+++ b/docs/build/html/api/net.corda.contracts.asset/-obligation/-state/-init-.html
@ -7,7 +7,7 @@
 <a href="../../index.html">net.corda.contracts.asset</a>&nbsp;/&nbsp;<a href="../index.html">Obligation</a>&nbsp;/&nbsp;<a href="index.html">State</a>&nbsp;/&nbsp;<a href=".">&lt;init&gt;</a><br/>
 <br/>
 <h1>&lt;init&gt;</h1>
-<code><span class="identifier">State</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Obligation.State$<init>(net.corda.contracts.asset.Obligation.Lifecycle, net.corda.core.crypto.Party, net.corda.contracts.asset.Obligation.Terms((net.corda.contracts.asset.Obligation.State.P)), kotlin.Long, java.security.PublicKey)/lifecycle">lifecycle</span><span class="symbol">:</span>&nbsp;<a href="../-lifecycle/index.html"><span class="identifier">Lifecycle</span></a>&nbsp;<span class="symbol">=</span>&nbsp;Lifecycle.NORMAL<span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Obligation.State$<init>(net.corda.contracts.asset.Obligation.Lifecycle, net.corda.core.crypto.Party, net.corda.contracts.asset.Obligation.Terms((net.corda.contracts.asset.Obligation.State.P)), kotlin.Long, java.security.PublicKey)/obligor">obligor</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Obligation.State$<init>(net.corda.contracts.asset.Obligation.Lifecycle, net.corda.core.crypto.Party, net.corda.contracts.asset.Obligation.Terms((net.corda.contracts.asset.Obligation.State.P)), kotlin.Long, java.security.PublicKey)/template">template</span><span class="symbol">:</span>&nbsp;<a href="../-terms/index.html"><span class="identifier">Terms</span></a><span class="symbol">&lt;</span><span class="identifier">P</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Obligation.State$<init>(net.corda.contracts.asset.Obligation.Lifecycle, net.corda.core.crypto.Party, net.corda.contracts.asset.Obligation.Terms((net.corda.contracts.asset.Obligation.State.P)), kotlin.Long, java.security.PublicKey)/quantity">quantity</span><span class="symbol">:</span>&nbsp;<span class="identifier">Long</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Obligation.State$<init>(net.corda.contracts.asset.Obligation.Lifecycle, net.corda.core.crypto.Party, net.corda.contracts.asset.Obligation.Terms((net.corda.contracts.asset.Obligation.State.P)), kotlin.Long, java.security.PublicKey)/beneficiary">beneficiary</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span></code><br/>
+<code><span class="identifier">State</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Obligation.State$<init>(net.corda.contracts.asset.Obligation.Lifecycle, net.corda.core.crypto.Party, net.corda.contracts.asset.Obligation.Terms((net.corda.contracts.asset.Obligation.State.P)), kotlin.Long, net.corda.core.crypto.PublicKeyTree)/lifecycle">lifecycle</span><span class="symbol">:</span>&nbsp;<a href="../-lifecycle/index.html"><span class="identifier">Lifecycle</span></a>&nbsp;<span class="symbol">=</span>&nbsp;Lifecycle.NORMAL<span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Obligation.State$<init>(net.corda.contracts.asset.Obligation.Lifecycle, net.corda.core.crypto.Party, net.corda.contracts.asset.Obligation.Terms((net.corda.contracts.asset.Obligation.State.P)), kotlin.Long, net.corda.core.crypto.PublicKeyTree)/obligor">obligor</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Obligation.State$<init>(net.corda.contracts.asset.Obligation.Lifecycle, net.corda.core.crypto.Party, net.corda.contracts.asset.Obligation.Terms((net.corda.contracts.asset.Obligation.State.P)), kotlin.Long, net.corda.core.crypto.PublicKeyTree)/template">template</span><span class="symbol">:</span>&nbsp;<a href="../-terms/index.html"><span class="identifier">Terms</span></a><span class="symbol">&lt;</span><span class="identifier">P</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Obligation.State$<init>(net.corda.contracts.asset.Obligation.Lifecycle, net.corda.core.crypto.Party, net.corda.contracts.asset.Obligation.Terms((net.corda.contracts.asset.Obligation.State.P)), kotlin.Long, net.corda.core.crypto.PublicKeyTree)/quantity">quantity</span><span class="symbol">:</span>&nbsp;<span class="identifier">Long</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Obligation.State$<init>(net.corda.contracts.asset.Obligation.Lifecycle, net.corda.core.crypto.Party, net.corda.contracts.asset.Obligation.Terms((net.corda.contracts.asset.Obligation.State.P)), kotlin.Long, net.corda.core.crypto.PublicKeyTree)/beneficiary">beneficiary</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">)</span></code><br/>
 <p>A state representing the obligation of one party (obligor) to deliver a specified number of
 units of an underlying asset (described as token.acceptableIssuedProducts) to the beneficiary
 no later than the specified time.</p>
--- a/docs/build/html/api/net.corda.contracts.asset/-obligation/-state/beneficiary.html
+++ b/docs/build/html/api/net.corda.contracts.asset/-obligation/-state/beneficiary.html
@ -8,7 +8,7 @@
 <br/>
 <h1>beneficiary</h1>
 <a name="net.corda.contracts.asset.Obligation.State$beneficiary"></a>
-<code><span class="keyword">val </span><span class="identifier">beneficiary</span><span class="symbol">: </span><a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a></code><br/>
+<code><span class="keyword">val </span><span class="identifier">beneficiary</span><span class="symbol">: </span><a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a></code><br/>
 <p>The public key of the entity the contract pays to</p>
 <br/>
 <br/>
--- a/docs/build/html/api/net.corda.contracts.asset/-obligation/-state/exit-keys.html
+++ b/docs/build/html/api/net.corda.contracts.asset/-obligation/-state/exit-keys.html
@ -8,7 +8,7 @@
 <br/>
 <h1>exitKeys</h1>
 <a name="net.corda.contracts.asset.Obligation.State$exitKeys"></a>
-<code><span class="keyword">val </span><span class="identifier">exitKeys</span><span class="symbol">: </span><span class="identifier">Collection</span><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">&gt;</span></code><br/>
+<code><span class="keyword">val </span><span class="identifier">exitKeys</span><span class="symbol">: </span><span class="identifier">Collection</span><span class="symbol">&lt;</span><a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">&gt;</span></code><br/>
 Overrides <a href="../../../net.corda.core.contracts/-fungible-asset/exit-keys.html">FungibleAsset.exitKeys</a><br/>
 <p>There must be an ExitCommand signed by these keys to destroy the amount. While all states require their
 owner to sign, some (i.e. cash) also require the issuer.</p>
--- a/docs/build/html/api/net.corda.contracts.asset/-obligation/-state/index.html
+++ b/docs/build/html/api/net.corda.contracts.asset/-obligation/-state/index.html
@ -23,7 +23,7 @@ no later than the specified time.</p>
 <td>
 <a href="-init-.html">&lt;init&gt;</a></td>
 <td>
-<code><span class="identifier">State</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Obligation.State$<init>(net.corda.contracts.asset.Obligation.Lifecycle, net.corda.core.crypto.Party, net.corda.contracts.asset.Obligation.Terms((net.corda.contracts.asset.Obligation.State.P)), kotlin.Long, java.security.PublicKey)/lifecycle">lifecycle</span><span class="symbol">:</span>&nbsp;<a href="../-lifecycle/index.html"><span class="identifier">Lifecycle</span></a>&nbsp;<span class="symbol">=</span>&nbsp;Lifecycle.NORMAL<span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Obligation.State$<init>(net.corda.contracts.asset.Obligation.Lifecycle, net.corda.core.crypto.Party, net.corda.contracts.asset.Obligation.Terms((net.corda.contracts.asset.Obligation.State.P)), kotlin.Long, java.security.PublicKey)/obligor">obligor</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Obligation.State$<init>(net.corda.contracts.asset.Obligation.Lifecycle, net.corda.core.crypto.Party, net.corda.contracts.asset.Obligation.Terms((net.corda.contracts.asset.Obligation.State.P)), kotlin.Long, java.security.PublicKey)/template">template</span><span class="symbol">:</span>&nbsp;<a href="../-terms/index.html"><span class="identifier">Terms</span></a><span class="symbol">&lt;</span><span class="identifier">P</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Obligation.State$<init>(net.corda.contracts.asset.Obligation.Lifecycle, net.corda.core.crypto.Party, net.corda.contracts.asset.Obligation.Terms((net.corda.contracts.asset.Obligation.State.P)), kotlin.Long, java.security.PublicKey)/quantity">quantity</span><span class="symbol">:</span>&nbsp;<span class="identifier">Long</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Obligation.State$<init>(net.corda.contracts.asset.Obligation.Lifecycle, net.corda.core.crypto.Party, net.corda.contracts.asset.Obligation.Terms((net.corda.contracts.asset.Obligation.State.P)), kotlin.Long, java.security.PublicKey)/beneficiary">beneficiary</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span></code><p>A state representing the obligation of one party (obligor) to deliver a specified number of
+<code><span class="identifier">State</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Obligation.State$<init>(net.corda.contracts.asset.Obligation.Lifecycle, net.corda.core.crypto.Party, net.corda.contracts.asset.Obligation.Terms((net.corda.contracts.asset.Obligation.State.P)), kotlin.Long, net.corda.core.crypto.PublicKeyTree)/lifecycle">lifecycle</span><span class="symbol">:</span>&nbsp;<a href="../-lifecycle/index.html"><span class="identifier">Lifecycle</span></a>&nbsp;<span class="symbol">=</span>&nbsp;Lifecycle.NORMAL<span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Obligation.State$<init>(net.corda.contracts.asset.Obligation.Lifecycle, net.corda.core.crypto.Party, net.corda.contracts.asset.Obligation.Terms((net.corda.contracts.asset.Obligation.State.P)), kotlin.Long, net.corda.core.crypto.PublicKeyTree)/obligor">obligor</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Obligation.State$<init>(net.corda.contracts.asset.Obligation.Lifecycle, net.corda.core.crypto.Party, net.corda.contracts.asset.Obligation.Terms((net.corda.contracts.asset.Obligation.State.P)), kotlin.Long, net.corda.core.crypto.PublicKeyTree)/template">template</span><span class="symbol">:</span>&nbsp;<a href="../-terms/index.html"><span class="identifier">Terms</span></a><span class="symbol">&lt;</span><span class="identifier">P</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Obligation.State$<init>(net.corda.contracts.asset.Obligation.Lifecycle, net.corda.core.crypto.Party, net.corda.contracts.asset.Obligation.Terms((net.corda.contracts.asset.Obligation.State.P)), kotlin.Long, net.corda.core.crypto.PublicKeyTree)/quantity">quantity</span><span class="symbol">:</span>&nbsp;<span class="identifier">Long</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Obligation.State$<init>(net.corda.contracts.asset.Obligation.Lifecycle, net.corda.core.crypto.Party, net.corda.contracts.asset.Obligation.Terms((net.corda.contracts.asset.Obligation.State.P)), kotlin.Long, net.corda.core.crypto.PublicKeyTree)/beneficiary">beneficiary</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">)</span></code><p>A state representing the obligation of one party (obligor) to deliver a specified number of
 units of an underlying asset (described as token.acceptableIssuedProducts) to the beneficiary
 no later than the specified time.</p>
 </td>
@ -43,7 +43,7 @@ no later than the specified time.</p>
 <td>
 <a href="beneficiary.html">beneficiary</a></td>
 <td>
-<code><span class="keyword">val </span><span class="identifier">beneficiary</span><span class="symbol">: </span><a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a></code><p>The public key of the entity the contract pays to</p>
+<code><span class="keyword">val </span><span class="identifier">beneficiary</span><span class="symbol">: </span><a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a></code><p>The public key of the entity the contract pays to</p>
 </td>
 </tr>
 <tr>
@ -71,7 +71,7 @@ equal objects, they can be close out netted together.</p>
 <td>
 <a href="exit-keys.html">exitKeys</a></td>
 <td>
-<code><span class="keyword">val </span><span class="identifier">exitKeys</span><span class="symbol">: </span><span class="identifier">Collection</span><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">&gt;</span></code><p>There must be an ExitCommand signed by these keys to destroy the amount. While all states require their
+<code><span class="keyword">val </span><span class="identifier">exitKeys</span><span class="symbol">: </span><span class="identifier">Collection</span><span class="symbol">&lt;</span><a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">&gt;</span></code><p>There must be an ExitCommand signed by these keys to destroy the amount. While all states require their
 owner to sign, some (i.e. cash) also require the issuer.</p>
 </td>
 </tr>
@ -100,14 +100,14 @@ equal objects, they can be close out netted together.</p>
 <td>
 <a href="owner.html">owner</a></td>
 <td>
-<code><span class="keyword">val </span><span class="identifier">owner</span><span class="symbol">: </span><a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a></code><p>There must be a MoveCommand signed by this key to claim the amount</p>
+<code><span class="keyword">val </span><span class="identifier">owner</span><span class="symbol">: </span><a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a></code><p>There must be a MoveCommand signed by this key to claim the amount</p>
 </td>
 </tr>
 <tr>
 <td>
 <a href="participants.html">participants</a></td>
 <td>
-<code><span class="keyword">val </span><span class="identifier">participants</span><span class="symbol">: </span><span class="identifier">List</span><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">&gt;</span></code><p>A <emph>participant</emph> is any party that is able to consume this state in a valid transaction.</p>
+<code><span class="keyword">val </span><span class="identifier">participants</span><span class="symbol">: </span><span class="identifier">List</span><span class="symbol">&lt;</span><a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">&gt;</span></code><p>A <emph>participant</emph> is any party that is able to consume this state in a valid transaction.</p>
 </td>
 </tr>
 <tr>
@ -131,7 +131,7 @@ equal objects, they can be close out netted together.</p>
 <td>
 <a href="move.html">move</a></td>
 <td>
-<code><span class="keyword">fun </span><span class="identifier">move</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Obligation.State$move(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.contracts.asset.Obligation.Terms((net.corda.contracts.asset.Obligation.State.P)))))), java.security.PublicKey)/newAmount">newAmount</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="../-terms/index.html"><span class="identifier">Terms</span></a><span class="symbol">&lt;</span><span class="identifier">P</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Obligation.State$move(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.contracts.asset.Obligation.Terms((net.corda.contracts.asset.Obligation.State.P)))))), java.security.PublicKey)/newOwner">newOwner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">State</span><span class="symbol">&lt;</span><span class="identifier">P</span><span class="symbol">&gt;</span></code></td>
+<code><span class="keyword">fun </span><span class="identifier">move</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Obligation.State$move(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.contracts.asset.Obligation.Terms((net.corda.contracts.asset.Obligation.State.P)))))), net.corda.core.crypto.PublicKeyTree)/newAmount">newAmount</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="../-terms/index.html"><span class="identifier">Terms</span></a><span class="symbol">&lt;</span><span class="identifier">P</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Obligation.State$move(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.contracts.asset.Obligation.Terms((net.corda.contracts.asset.Obligation.State.P)))))), net.corda.core.crypto.PublicKeyTree)/newOwner">newOwner</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">State</span><span class="symbol">&lt;</span><span class="identifier">P</span><span class="symbol">&gt;</span></code></td>
 </tr>
 <tr>
 <td>
@ -151,7 +151,7 @@ bilateralNetState objects are equal).</p>
 <td>
 <a href="with-new-owner.html">withNewOwner</a></td>
 <td>
-<code><span class="keyword">fun </span><span class="identifier">withNewOwner</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Obligation.State$withNewOwner(java.security.PublicKey)/newOwner">newOwner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code><p>Copies the underlying data structure, replacing the owner field with this new value and leaving the rest alone</p>
+<code><span class="keyword">fun </span><span class="identifier">withNewOwner</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Obligation.State$withNewOwner(net.corda.core.crypto.PublicKeyTree)/newOwner">newOwner</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code><p>Copies the underlying data structure, replacing the owner field with this new value and leaving the rest alone</p>
 </td>
 </tr>
 </tbody>
@ -169,7 +169,7 @@ bilateralNetState objects are equal).</p>
 <td>
 <a href="../../between.html">between</a></td>
 <td>
-<code><span class="keyword">infix</span> <span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span> <span class="identifier">State</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">between</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset$between(net.corda.contracts.asset.Obligation.State((net.corda.contracts.asset.between.T)), ((net.corda.core.crypto.Party, java.security.PublicKey)))/parties">parties</span><span class="symbol">:</span>&nbsp;<span class="identifier">&lt;ERROR CLASS&gt;</span><span class="symbol">&lt;</span><a href="../../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">,</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">State</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code></td>
+<code><span class="keyword">infix</span> <span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span> <span class="identifier">State</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">between</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset$between(net.corda.contracts.asset.Obligation.State((net.corda.contracts.asset.between.T)), ((net.corda.core.crypto.Party, net.corda.core.crypto.PublicKeyTree)))/parties">parties</span><span class="symbol">:</span>&nbsp;<span class="identifier">&lt;ERROR CLASS&gt;</span><span class="symbol">&lt;</span><a href="../../../net.corda.core.crypto/-party/index.html"><span class="identifier">Party</span></a><span class="symbol">,</span>&nbsp;<a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">State</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code></td>
 </tr>
 <tr>
 <td>
@ -187,13 +187,13 @@ bilateralNetState objects are equal).</p>
 <td>
 <a href="../../owned by.html">owned by</a></td>
 <td>
-<code><span class="keyword">infix</span> <span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span> <span class="identifier">State</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">owned by</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset$owned by(net.corda.contracts.asset.Obligation.State((net.corda.contracts.asset.owned by.T)), java.security.PublicKey)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">State</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code></td>
+<code><span class="keyword">infix</span> <span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span> <span class="identifier">State</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">owned by</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset$owned by(net.corda.contracts.asset.Obligation.State((net.corda.contracts.asset.owned by.T)), net.corda.core.crypto.PublicKeyTree)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">State</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code></td>
 </tr>
 <tr>
 <td>
 <a href="../../owned-by.html">ownedBy</a></td>
 <td>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span> <span class="identifier">State</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">ownedBy</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset$ownedBy(net.corda.contracts.asset.Obligation.State((net.corda.contracts.asset.ownedBy.T)), java.security.PublicKey)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">State</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code></td>
+<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span> <span class="identifier">State</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">ownedBy</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset$ownedBy(net.corda.contracts.asset.Obligation.State((net.corda.contracts.asset.ownedBy.T)), net.corda.core.crypto.PublicKeyTree)/owner">owner</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">State</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code></td>
 </tr>
 </tbody>
 </table>
--- a/docs/build/html/api/net.corda.contracts.asset/-obligation/-state/move.html
+++ b/docs/build/html/api/net.corda.contracts.asset/-obligation/-state/move.html
@ -7,8 +7,8 @@
 <a href="../../index.html">net.corda.contracts.asset</a>&nbsp;/&nbsp;<a href="../index.html">Obligation</a>&nbsp;/&nbsp;<a href="index.html">State</a>&nbsp;/&nbsp;<a href=".">move</a><br/>
 <br/>
 <h1>move</h1>
-<a name="net.corda.contracts.asset.Obligation.State$move(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.contracts.asset.Obligation.Terms((net.corda.contracts.asset.Obligation.State.P)))))), java.security.PublicKey)"></a>
-<code><span class="keyword">fun </span><span class="identifier">move</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Obligation.State$move(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.contracts.asset.Obligation.Terms((net.corda.contracts.asset.Obligation.State.P)))))), java.security.PublicKey)/newAmount">newAmount</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="../-terms/index.html"><span class="identifier">Terms</span></a><span class="symbol">&lt;</span><span class="identifier">P</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Obligation.State$move(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.contracts.asset.Obligation.Terms((net.corda.contracts.asset.Obligation.State.P)))))), java.security.PublicKey)/newOwner">newOwner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="index.html"><span class="identifier">State</span></a><span class="symbol">&lt;</span><span class="identifier">P</span><span class="symbol">&gt;</span></code><br/>
+<a name="net.corda.contracts.asset.Obligation.State$move(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.contracts.asset.Obligation.Terms((net.corda.contracts.asset.Obligation.State.P)))))), net.corda.core.crypto.PublicKeyTree)"></a>
+<code><span class="keyword">fun </span><span class="identifier">move</span><span class="symbol">(</span><span class="identifier" id="net.corda.contracts.asset.Obligation.State$move(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.contracts.asset.Obligation.Terms((net.corda.contracts.asset.Obligation.State.P)))))), net.corda.core.crypto.PublicKeyTree)/newAmount">newAmount</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../../net.corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="../-terms/index.html"><span class="identifier">Terms</span></a><span class="symbol">&lt;</span><span class="identifier">P</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="net.corda.contracts.asset.Obligation.State$move(net.corda.core.contracts.Amount((net.corda.core.contracts.Issued((net.corda.contracts.asset.Obligation.Terms((net.corda.contracts.asset.Obligation.State.P)))))), net.corda.core.crypto.PublicKeyTree)/newOwner">newOwner</span><span class="symbol">:</span>&nbsp;<a href="../../../net.corda.core.crypto/-public-key-tree/index.html"><span class="identifier">PublicKeyTree</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="index.html"><span class="identifier">State</span></a><span class="symbol">&lt;</span><span class="identifier">P</span><span class="symbol">&gt;</span></code><br/>
 <br/>
 <br/>
 </BODY>
--- a/Show More
+++ b/Show More