diff --git a/.ci/api-current.txt b/.ci/api-current.txt
index 3e9bd9ac16..3f85ca4ab5 100644
--- a/.ci/api-current.txt
+++ b/.ci/api-current.txt
@@ -1,44 +1,60 @@
-@net.corda.core.serialization.CordaSerializable public class net.corda.core.CordaException extends java.lang.Exception implements net.corda.core.CordaThrowable
+@CordaSerializable
+public class net.corda.core.CordaException extends java.lang.Exception implements net.corda.core.CordaThrowable
   public <init>()
   public <init>(String)
   public <init>(String, String, Throwable)
   public <init>(String, Throwable)
   public void addSuppressed(Throwable[])
   public boolean equals(Object)
-  @org.jetbrains.annotations.Nullable public Throwable getCause()
-  @org.jetbrains.annotations.Nullable public String getMessage()
-  @org.jetbrains.annotations.Nullable public String getOriginalExceptionClassName()
-  @org.jetbrains.annotations.Nullable public String getOriginalMessage()
+  @Nullable
+  public Throwable getCause()
+  @Nullable
+  public String getMessage()
+  @Nullable
+  public String getOriginalExceptionClassName()
+  @Nullable
+  public String getOriginalMessage()
   public int hashCode()
   public void setCause(Throwable)
   public void setMessage(String)
   public void setOriginalExceptionClassName(String)
 ##
 public final class net.corda.core.CordaOID extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public static final String CORDA_PLATFORM = "1.3.6.1.4.1.50530.1"
+  @NotNull
+  public static final String CORDA_PLATFORM = "1.3.6.1.4.1.50530.1"
   public static final net.corda.core.CordaOID INSTANCE
-  @org.jetbrains.annotations.NotNull public static final String R3_ROOT = "1.3.6.1.4.1.50530"
-  @org.jetbrains.annotations.NotNull public static final String X509_EXTENSION_CORDA_ROLE = "1.3.6.1.4.1.50530.1.1"
+  @NotNull
+  public static final String R3_ROOT = "1.3.6.1.4.1.50530"
+  @NotNull
+  public static final String X509_EXTENSION_CORDA_ROLE = "1.3.6.1.4.1.50530.1.1"
 ##
-@net.corda.core.serialization.CordaSerializable public class net.corda.core.CordaRuntimeException extends java.lang.RuntimeException implements net.corda.core.CordaThrowable
+@CordaSerializable
+public class net.corda.core.CordaRuntimeException extends java.lang.RuntimeException implements net.corda.core.CordaThrowable
   public <init>(String)
   public <init>(String, String, Throwable)
   public <init>(String, Throwable)
   public void addSuppressed(Throwable[])
   public boolean equals(Object)
-  @org.jetbrains.annotations.Nullable public Throwable getCause()
-  @org.jetbrains.annotations.Nullable public String getMessage()
-  @org.jetbrains.annotations.Nullable public String getOriginalExceptionClassName()
-  @org.jetbrains.annotations.Nullable public String getOriginalMessage()
+  @Nullable
+  public Throwable getCause()
+  @Nullable
+  public String getMessage()
+  @Nullable
+  public String getOriginalExceptionClassName()
+  @Nullable
+  public String getOriginalMessage()
   public int hashCode()
   public void setCause(Throwable)
   public void setMessage(String)
   public void setOriginalExceptionClassName(String)
 ##
-@net.corda.core.serialization.CordaSerializable public interface net.corda.core.CordaThrowable
+@CordaSerializable
+public interface net.corda.core.CordaThrowable
   public abstract void addSuppressed(Throwable[])
-  @org.jetbrains.annotations.Nullable public abstract String getOriginalExceptionClassName()
-  @org.jetbrains.annotations.Nullable public abstract String getOriginalMessage()
+  @Nullable
+  public abstract String getOriginalExceptionClassName()
+  @Nullable
+  public abstract String getOriginalMessage()
   public abstract void setCause(Throwable)
   public abstract void setMessage(String)
   public abstract void setOriginalExceptionClassName(String)
@@ -46,383 +62,599 @@ public final class net.corda.core.CordaOID extends java.lang.Object
 public @interface net.corda.core.DoNotImplement
 ##
 public final class net.corda.core.Utils extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.concurrent.CordaFuture toFuture(rx.Observable)
-  @org.jetbrains.annotations.NotNull public static final rx.Observable toObservable(net.corda.core.concurrent.CordaFuture)
+  @NotNull
+  public static final net.corda.core.concurrent.CordaFuture<T> toFuture(rx.Observable<T>)
+  @NotNull
+  public static final rx.Observable<A> toObservable(net.corda.core.concurrent.CordaFuture<? extends A>)
 ##
 public final class net.corda.core.concurrent.ConcurrencyUtils extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.concurrent.CordaFuture firstOf(net.corda.core.concurrent.CordaFuture[], kotlin.jvm.functions.Function1)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.concurrent.CordaFuture firstOf(net.corda.core.concurrent.CordaFuture[], org.slf4j.Logger, kotlin.jvm.functions.Function1)
-  public static final Object match(concurrent.Future, kotlin.jvm.functions.Function1, kotlin.jvm.functions.Function1)
-  @org.jetbrains.annotations.NotNull public static final String shortCircuitedTaskFailedMessage = "Short-circuited task failed:"
+  @NotNull
+  public static final net.corda.core.concurrent.CordaFuture<W> firstOf(net.corda.core.concurrent.CordaFuture<? extends V>[], kotlin.jvm.functions.Function1<? super net.corda.core.concurrent.CordaFuture<? extends V>, ? extends W>)
+  @NotNull
+  public static final net.corda.core.concurrent.CordaFuture<W> firstOf(net.corda.core.concurrent.CordaFuture<? extends V>[], org.slf4j.Logger, kotlin.jvm.functions.Function1<? super net.corda.core.concurrent.CordaFuture<? extends V>, ? extends W>)
+  public static final W match(java.util.concurrent.Future<V>, kotlin.jvm.functions.Function1<? super V, ? extends W>, kotlin.jvm.functions.Function1<? super Throwable, ? extends W>)
+  @NotNull
+  public static final String shortCircuitedTaskFailedMessage = "Short-circuited task failed:"
 ##
 public interface net.corda.core.concurrent.CordaFuture extends java.util.concurrent.Future
-  public abstract void then(kotlin.jvm.functions.Function1)
-  @org.jetbrains.annotations.NotNull public abstract concurrent.CompletableFuture toCompletableFuture()
+  public abstract void then(kotlin.jvm.functions.Function1<? super net.corda.core.concurrent.CordaFuture<V>, ? extends W>)
+  @NotNull
+  public abstract java.util.concurrent.CompletableFuture<V> toCompletableFuture()
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.context.Actor extends java.lang.Object
+@CordaSerializable
+public final class net.corda.core.context.Actor extends java.lang.Object
   public <init>(net.corda.core.context.Actor$Id, net.corda.core.context.AuthServiceId, net.corda.core.identity.CordaX500Name)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.context.Actor$Id component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.context.AuthServiceId component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.CordaX500Name component3()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.context.Actor copy(net.corda.core.context.Actor$Id, net.corda.core.context.AuthServiceId, net.corda.core.identity.CordaX500Name)
+  @NotNull
+  public final net.corda.core.context.Actor$Id component1()
+  @NotNull
+  public final net.corda.core.context.AuthServiceId component2()
+  @NotNull
+  public final net.corda.core.identity.CordaX500Name component3()
+  @NotNull
+  public final net.corda.core.context.Actor copy(net.corda.core.context.Actor$Id, net.corda.core.context.AuthServiceId, net.corda.core.identity.CordaX500Name)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.context.Actor$Id getId()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.CordaX500Name getOwningLegalIdentity()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.context.AuthServiceId getServiceId()
+  @NotNull
+  public final net.corda.core.context.Actor$Id getId()
+  @NotNull
+  public final net.corda.core.identity.CordaX500Name getOwningLegalIdentity()
+  @NotNull
+  public final net.corda.core.context.AuthServiceId getServiceId()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.context.Actor service(String, net.corda.core.identity.CordaX500Name)
+  @NotNull
+  public static final net.corda.core.context.Actor service(String, net.corda.core.identity.CordaX500Name)
   public String toString()
   public static final net.corda.core.context.Actor$Companion Companion
 ##
 public static final class net.corda.core.context.Actor$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.context.Actor service(String, net.corda.core.identity.CordaX500Name)
+  @NotNull
+  public final net.corda.core.context.Actor service(String, net.corda.core.identity.CordaX500Name)
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.context.Actor$Id extends java.lang.Object
+@CordaSerializable
+public static final class net.corda.core.context.Actor$Id extends java.lang.Object
   public <init>(String)
-  @org.jetbrains.annotations.NotNull public final String component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.context.Actor$Id copy(String)
+  @NotNull
+  public final String component1()
+  @NotNull
+  public final net.corda.core.context.Actor$Id copy(String)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final String getValue()
+  @NotNull
+  public final String getValue()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.context.AuthServiceId extends java.lang.Object
+@CordaSerializable
+public final class net.corda.core.context.AuthServiceId extends java.lang.Object
   public <init>(String)
-  @org.jetbrains.annotations.NotNull public final String component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.context.AuthServiceId copy(String)
+  @NotNull
+  public final String component1()
+  @NotNull
+  public final net.corda.core.context.AuthServiceId copy(String)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final String getValue()
+  @NotNull
+  public final String getValue()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.context.InvocationContext extends java.lang.Object
+@CordaSerializable
+public final class net.corda.core.context.InvocationContext extends java.lang.Object
   public <init>(net.corda.core.context.InvocationOrigin, net.corda.core.context.Trace, net.corda.core.context.Actor, net.corda.core.context.Trace, net.corda.core.context.Actor)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.context.InvocationOrigin component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.context.Trace component2()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.context.Actor component3()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.context.Trace component4()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.context.Actor component5()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.context.InvocationContext copy(net.corda.core.context.InvocationOrigin, net.corda.core.context.Trace, net.corda.core.context.Actor, net.corda.core.context.Trace, net.corda.core.context.Actor)
+  @NotNull
+  public final net.corda.core.context.InvocationOrigin component1()
+  @NotNull
+  public final net.corda.core.context.Trace component2()
+  @Nullable
+  public final net.corda.core.context.Actor component3()
+  @Nullable
+  public final net.corda.core.context.Trace component4()
+  @Nullable
+  public final net.corda.core.context.Actor component5()
+  @NotNull
+  public final net.corda.core.context.InvocationContext copy(net.corda.core.context.InvocationOrigin, net.corda.core.context.Trace, net.corda.core.context.Actor, net.corda.core.context.Trace, net.corda.core.context.Actor)
   public boolean equals(Object)
-  @org.jetbrains.annotations.Nullable public final net.corda.core.context.Actor getActor()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.context.Trace getExternalTrace()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.context.Actor getImpersonatedActor()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.context.InvocationOrigin getOrigin()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.context.Trace getTrace()
+  @Nullable
+  public final net.corda.core.context.Actor getActor()
+  @Nullable
+  public final net.corda.core.context.Trace getExternalTrace()
+  @Nullable
+  public final net.corda.core.context.Actor getImpersonatedActor()
+  @NotNull
+  public final net.corda.core.context.InvocationOrigin getOrigin()
+  @NotNull
+  public final net.corda.core.context.Trace getTrace()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.context.InvocationContext newInstance(net.corda.core.context.InvocationOrigin, net.corda.core.context.Trace, net.corda.core.context.Actor, net.corda.core.context.Trace, net.corda.core.context.Actor)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.context.InvocationContext peer(net.corda.core.identity.CordaX500Name, net.corda.core.context.Trace, net.corda.core.context.Trace, net.corda.core.context.Actor)
-  @org.jetbrains.annotations.NotNull public final java.security.Principal principal()
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.context.InvocationContext rpc(net.corda.core.context.Actor, net.corda.core.context.Trace, net.corda.core.context.Trace, net.corda.core.context.Actor)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.context.InvocationContext scheduled(net.corda.core.contracts.ScheduledStateRef, net.corda.core.context.Trace, net.corda.core.context.Trace)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.context.InvocationContext service(String, net.corda.core.identity.CordaX500Name, net.corda.core.context.Trace, net.corda.core.context.Trace)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.context.InvocationContext shell(net.corda.core.context.Trace, net.corda.core.context.Trace)
+  @NotNull
+  public static final net.corda.core.context.InvocationContext newInstance(net.corda.core.context.InvocationOrigin, net.corda.core.context.Trace, net.corda.core.context.Actor, net.corda.core.context.Trace, net.corda.core.context.Actor)
+  @NotNull
+  public static final net.corda.core.context.InvocationContext peer(net.corda.core.identity.CordaX500Name, net.corda.core.context.Trace, net.corda.core.context.Trace, net.corda.core.context.Actor)
+  @NotNull
+  public final java.security.Principal principal()
+  @NotNull
+  public static final net.corda.core.context.InvocationContext rpc(net.corda.core.context.Actor, net.corda.core.context.Trace, net.corda.core.context.Trace, net.corda.core.context.Actor)
+  @NotNull
+  public static final net.corda.core.context.InvocationContext scheduled(net.corda.core.contracts.ScheduledStateRef, net.corda.core.context.Trace, net.corda.core.context.Trace)
+  @NotNull
+  public static final net.corda.core.context.InvocationContext service(String, net.corda.core.identity.CordaX500Name, net.corda.core.context.Trace, net.corda.core.context.Trace)
+  @NotNull
+  public static final net.corda.core.context.InvocationContext shell(net.corda.core.context.Trace, net.corda.core.context.Trace)
   public String toString()
   public static final net.corda.core.context.InvocationContext$Companion Companion
 ##
 public static final class net.corda.core.context.InvocationContext$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.context.InvocationContext newInstance(net.corda.core.context.InvocationOrigin, net.corda.core.context.Trace, net.corda.core.context.Actor, net.corda.core.context.Trace, net.corda.core.context.Actor)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.context.InvocationContext peer(net.corda.core.identity.CordaX500Name, net.corda.core.context.Trace, net.corda.core.context.Trace, net.corda.core.context.Actor)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.context.InvocationContext rpc(net.corda.core.context.Actor, net.corda.core.context.Trace, net.corda.core.context.Trace, net.corda.core.context.Actor)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.context.InvocationContext scheduled(net.corda.core.contracts.ScheduledStateRef, net.corda.core.context.Trace, net.corda.core.context.Trace)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.context.InvocationContext service(String, net.corda.core.identity.CordaX500Name, net.corda.core.context.Trace, net.corda.core.context.Trace)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.context.InvocationContext shell(net.corda.core.context.Trace, net.corda.core.context.Trace)
+  @NotNull
+  public final net.corda.core.context.InvocationContext newInstance(net.corda.core.context.InvocationOrigin, net.corda.core.context.Trace, net.corda.core.context.Actor, net.corda.core.context.Trace, net.corda.core.context.Actor)
+  @NotNull
+  public final net.corda.core.context.InvocationContext peer(net.corda.core.identity.CordaX500Name, net.corda.core.context.Trace, net.corda.core.context.Trace, net.corda.core.context.Actor)
+  @NotNull
+  public final net.corda.core.context.InvocationContext rpc(net.corda.core.context.Actor, net.corda.core.context.Trace, net.corda.core.context.Trace, net.corda.core.context.Actor)
+  @NotNull
+  public final net.corda.core.context.InvocationContext scheduled(net.corda.core.contracts.ScheduledStateRef, net.corda.core.context.Trace, net.corda.core.context.Trace)
+  @NotNull
+  public final net.corda.core.context.InvocationContext service(String, net.corda.core.identity.CordaX500Name, net.corda.core.context.Trace, net.corda.core.context.Trace)
+  @NotNull
+  public final net.corda.core.context.InvocationContext shell(net.corda.core.context.Trace, net.corda.core.context.Trace)
 ##
-@net.corda.core.serialization.CordaSerializable public abstract class net.corda.core.context.InvocationOrigin extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public abstract java.security.Principal principal()
+@CordaSerializable
+public abstract class net.corda.core.context.InvocationOrigin extends java.lang.Object
+  @NotNull
+  public abstract java.security.Principal principal()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.context.InvocationOrigin$Peer extends net.corda.core.context.InvocationOrigin
+@CordaSerializable
+public static final class net.corda.core.context.InvocationOrigin$Peer extends net.corda.core.context.InvocationOrigin
   public <init>(net.corda.core.identity.CordaX500Name)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.CordaX500Name component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.context.InvocationOrigin$Peer copy(net.corda.core.identity.CordaX500Name)
+  @NotNull
+  public final net.corda.core.identity.CordaX500Name component1()
+  @NotNull
+  public final net.corda.core.context.InvocationOrigin$Peer copy(net.corda.core.identity.CordaX500Name)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.CordaX500Name getParty()
+  @NotNull
+  public final net.corda.core.identity.CordaX500Name getParty()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public java.security.Principal principal()
+  @NotNull
+  public java.security.Principal principal()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.context.InvocationOrigin$RPC extends net.corda.core.context.InvocationOrigin
+@CordaSerializable
+public static final class net.corda.core.context.InvocationOrigin$RPC extends net.corda.core.context.InvocationOrigin
   public <init>(net.corda.core.context.Actor)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.context.InvocationOrigin$RPC copy(net.corda.core.context.Actor)
+  @NotNull
+  public final net.corda.core.context.InvocationOrigin$RPC copy(net.corda.core.context.Actor)
   public boolean equals(Object)
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public java.security.Principal principal()
+  @NotNull
+  public java.security.Principal principal()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.context.InvocationOrigin$Scheduled extends net.corda.core.context.InvocationOrigin
+@CordaSerializable
+public static final class net.corda.core.context.InvocationOrigin$Scheduled extends net.corda.core.context.InvocationOrigin
   public <init>(net.corda.core.contracts.ScheduledStateRef)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.ScheduledStateRef component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.context.InvocationOrigin$Scheduled copy(net.corda.core.contracts.ScheduledStateRef)
+  @NotNull
+  public final net.corda.core.contracts.ScheduledStateRef component1()
+  @NotNull
+  public final net.corda.core.context.InvocationOrigin$Scheduled copy(net.corda.core.contracts.ScheduledStateRef)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.ScheduledStateRef getScheduledState()
+  @NotNull
+  public final net.corda.core.contracts.ScheduledStateRef getScheduledState()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public java.security.Principal principal()
+  @NotNull
+  public java.security.Principal principal()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.context.InvocationOrigin$Service extends net.corda.core.context.InvocationOrigin
+@CordaSerializable
+public static final class net.corda.core.context.InvocationOrigin$Service extends net.corda.core.context.InvocationOrigin
   public <init>(String, net.corda.core.identity.CordaX500Name)
-  @org.jetbrains.annotations.NotNull public final String component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.CordaX500Name component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.context.InvocationOrigin$Service copy(String, net.corda.core.identity.CordaX500Name)
+  @NotNull
+  public final String component1()
+  @NotNull
+  public final net.corda.core.identity.CordaX500Name component2()
+  @NotNull
+  public final net.corda.core.context.InvocationOrigin$Service copy(String, net.corda.core.identity.CordaX500Name)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.CordaX500Name getOwningLegalIdentity()
-  @org.jetbrains.annotations.NotNull public final String getServiceClassName()
+  @NotNull
+  public final net.corda.core.identity.CordaX500Name getOwningLegalIdentity()
+  @NotNull
+  public final String getServiceClassName()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public java.security.Principal principal()
+  @NotNull
+  public java.security.Principal principal()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.context.InvocationOrigin$Shell extends net.corda.core.context.InvocationOrigin
-  @org.jetbrains.annotations.NotNull public java.security.Principal principal()
+@CordaSerializable
+public static final class net.corda.core.context.InvocationOrigin$Shell extends net.corda.core.context.InvocationOrigin
+  @NotNull
+  public java.security.Principal principal()
   public static final net.corda.core.context.InvocationOrigin$Shell INSTANCE
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.context.Trace extends java.lang.Object
+@CordaSerializable
+public final class net.corda.core.context.Trace extends java.lang.Object
   public <init>(net.corda.core.context.Trace$InvocationId, net.corda.core.context.Trace$SessionId)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.context.Trace$InvocationId component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.context.Trace$SessionId component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.context.Trace copy(net.corda.core.context.Trace$InvocationId, net.corda.core.context.Trace$SessionId)
+  @NotNull
+  public final net.corda.core.context.Trace$InvocationId component1()
+  @NotNull
+  public final net.corda.core.context.Trace$SessionId component2()
+  @NotNull
+  public final net.corda.core.context.Trace copy(net.corda.core.context.Trace$InvocationId, net.corda.core.context.Trace$SessionId)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.context.Trace$InvocationId getInvocationId()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.context.Trace$SessionId getSessionId()
+  @NotNull
+  public final net.corda.core.context.Trace$InvocationId getInvocationId()
+  @NotNull
+  public final net.corda.core.context.Trace$SessionId getSessionId()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.context.Trace newInstance(net.corda.core.context.Trace$InvocationId, net.corda.core.context.Trace$SessionId)
+  @NotNull
+  public static final net.corda.core.context.Trace newInstance(net.corda.core.context.Trace$InvocationId, net.corda.core.context.Trace$SessionId)
   public String toString()
   public static final net.corda.core.context.Trace$Companion Companion
 ##
 public static final class net.corda.core.context.Trace$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.context.Trace newInstance(net.corda.core.context.Trace$InvocationId, net.corda.core.context.Trace$SessionId)
+  @NotNull
+  public final net.corda.core.context.Trace newInstance(net.corda.core.context.Trace$InvocationId, net.corda.core.context.Trace$SessionId)
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.context.Trace$InvocationId extends net.corda.core.utilities.Id
+@CordaSerializable
+public static final class net.corda.core.context.Trace$InvocationId extends net.corda.core.utilities.Id
   public <init>(String, java.time.Instant)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.context.Trace$InvocationId newInstance(String, java.time.Instant)
+  @NotNull
+  public static final net.corda.core.context.Trace$InvocationId newInstance(String, java.time.Instant)
   public static final net.corda.core.context.Trace$InvocationId$Companion Companion
 ##
 public static final class net.corda.core.context.Trace$InvocationId$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.context.Trace$InvocationId newInstance(String, java.time.Instant)
+  @NotNull
+  public final net.corda.core.context.Trace$InvocationId newInstance(String, java.time.Instant)
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.context.Trace$SessionId extends net.corda.core.utilities.Id
+@CordaSerializable
+public static final class net.corda.core.context.Trace$SessionId extends net.corda.core.utilities.Id
   public <init>(String, java.time.Instant)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.context.Trace$SessionId newInstance(String, java.time.Instant)
+  @NotNull
+  public static final net.corda.core.context.Trace$SessionId newInstance(String, java.time.Instant)
   public static final net.corda.core.context.Trace$SessionId$Companion Companion
 ##
 public static final class net.corda.core.context.Trace$SessionId$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.context.Trace$SessionId newInstance(String, java.time.Instant)
+  @NotNull
+  public final net.corda.core.context.Trace$SessionId newInstance(String, java.time.Instant)
 ##
-@net.corda.core.DoNotImplement @net.corda.core.serialization.CordaSerializable public final class net.corda.core.contracts.AlwaysAcceptAttachmentConstraint extends java.lang.Object implements net.corda.core.contracts.AttachmentConstraint
+@DoNotImplement
+@CordaSerializable
+public final class net.corda.core.contracts.AlwaysAcceptAttachmentConstraint extends java.lang.Object implements net.corda.core.contracts.AttachmentConstraint
   public boolean isSatisfiedBy(net.corda.core.contracts.Attachment)
   public static final net.corda.core.contracts.AlwaysAcceptAttachmentConstraint INSTANCE
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.contracts.Amount extends java.lang.Object implements java.lang.Comparable
-  public <init>(long, Object)
-  public <init>(long, java.math.BigDecimal, Object)
-  public int compareTo(net.corda.core.contracts.Amount)
+@CordaSerializable
+public final class net.corda.core.contracts.Amount extends java.lang.Object implements java.lang.Comparable
+  public <init>(long, T)
+  public <init>(long, java.math.BigDecimal, T)
+  public int compareTo(net.corda.core.contracts.Amount<T>)
   public final long component1()
-  @org.jetbrains.annotations.NotNull public final java.math.BigDecimal component2()
-  @org.jetbrains.annotations.NotNull public final Object component3()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.Amount copy(long, java.math.BigDecimal, Object)
+  @NotNull
+  public final java.math.BigDecimal component2()
+  @NotNull
+  public final T component3()
+  @NotNull
+  public final net.corda.core.contracts.Amount<T> copy(long, java.math.BigDecimal, T)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.contracts.Amount fromDecimal(java.math.BigDecimal, Object)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.contracts.Amount fromDecimal(java.math.BigDecimal, Object, java.math.RoundingMode)
-  @org.jetbrains.annotations.NotNull public final java.math.BigDecimal getDisplayTokenSize()
-  @org.jetbrains.annotations.NotNull public static final java.math.BigDecimal getDisplayTokenSize(Object)
+  @NotNull
+  public static final net.corda.core.contracts.Amount<T> fromDecimal(java.math.BigDecimal, T)
+  @NotNull
+  public static final net.corda.core.contracts.Amount<T> fromDecimal(java.math.BigDecimal, T, java.math.RoundingMode)
+  @NotNull
+  public final java.math.BigDecimal getDisplayTokenSize()
+  @NotNull
+  public static final java.math.BigDecimal getDisplayTokenSize(Object)
   public final long getQuantity()
-  @org.jetbrains.annotations.NotNull public final Object getToken()
+  @NotNull
+  public final T getToken()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.Amount minus(net.corda.core.contracts.Amount)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.contracts.Amount parseCurrency(String)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.Amount plus(net.corda.core.contracts.Amount)
-  @org.jetbrains.annotations.NotNull public final List splitEvenly(int)
-  @org.jetbrains.annotations.Nullable public static final net.corda.core.contracts.Amount sumOrNull(Iterable)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.contracts.Amount sumOrThrow(Iterable)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.contracts.Amount sumOrZero(Iterable, Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.Amount times(int)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.Amount times(long)
-  @org.jetbrains.annotations.NotNull public final java.math.BigDecimal toDecimal()
-  @org.jetbrains.annotations.NotNull public String toString()
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.contracts.Amount zero(Object)
+  @NotNull
+  public final net.corda.core.contracts.Amount<T> minus(net.corda.core.contracts.Amount<T>)
+  @NotNull
+  public static final net.corda.core.contracts.Amount<java.util.Currency> parseCurrency(String)
+  @NotNull
+  public final net.corda.core.contracts.Amount<T> plus(net.corda.core.contracts.Amount<T>)
+  @NotNull
+  public final java.util.List<net.corda.core.contracts.Amount<T>> splitEvenly(int)
+  @Nullable
+  public static final net.corda.core.contracts.Amount<T> sumOrNull(Iterable<net.corda.core.contracts.Amount<T>>)
+  @NotNull
+  public static final net.corda.core.contracts.Amount<T> sumOrThrow(Iterable<net.corda.core.contracts.Amount<T>>)
+  @NotNull
+  public static final net.corda.core.contracts.Amount<T> sumOrZero(Iterable<net.corda.core.contracts.Amount<T>>, T)
+  @NotNull
+  public final net.corda.core.contracts.Amount<T> times(int)
+  @NotNull
+  public final net.corda.core.contracts.Amount<T> times(long)
+  @NotNull
+  public final java.math.BigDecimal toDecimal()
+  @NotNull
+  public String toString()
+  @NotNull
+  public static final net.corda.core.contracts.Amount<T> zero(T)
   public static final net.corda.core.contracts.Amount$Companion Companion
 ##
 public static final class net.corda.core.contracts.Amount$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.Amount fromDecimal(java.math.BigDecimal, Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.Amount fromDecimal(java.math.BigDecimal, Object, java.math.RoundingMode)
-  @org.jetbrains.annotations.NotNull public final java.math.BigDecimal getDisplayTokenSize(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.Amount parseCurrency(String)
-  @org.jetbrains.annotations.Nullable public final net.corda.core.contracts.Amount sumOrNull(Iterable)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.Amount sumOrThrow(Iterable)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.Amount sumOrZero(Iterable, Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.Amount zero(Object)
+  @NotNull
+  public final net.corda.core.contracts.Amount<T> fromDecimal(java.math.BigDecimal, T)
+  @NotNull
+  public final net.corda.core.contracts.Amount<T> fromDecimal(java.math.BigDecimal, T, java.math.RoundingMode)
+  @NotNull
+  public final java.math.BigDecimal getDisplayTokenSize(Object)
+  @NotNull
+  public final net.corda.core.contracts.Amount<java.util.Currency> parseCurrency(String)
+  @Nullable
+  public final net.corda.core.contracts.Amount<T> sumOrNull(Iterable<net.corda.core.contracts.Amount<T>>)
+  @NotNull
+  public final net.corda.core.contracts.Amount<T> sumOrThrow(Iterable<net.corda.core.contracts.Amount<T>>)
+  @NotNull
+  public final net.corda.core.contracts.Amount<T> sumOrZero(Iterable<net.corda.core.contracts.Amount<T>>, T)
+  @NotNull
+  public final net.corda.core.contracts.Amount<T> zero(T)
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.contracts.AmountTransfer extends java.lang.Object
-  public <init>(long, Object, Object, Object)
-  @org.jetbrains.annotations.NotNull public final List apply(List, Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.AmountTransfer copy(long, Object, Object, Object)
+@CordaSerializable
+public final class net.corda.core.contracts.AmountTransfer extends java.lang.Object
+  public <init>(long, T, P, P)
+  @NotNull
+  public final java.util.List<net.corda.core.contracts.SourceAndAmount<T, P>> apply(java.util.List<? extends net.corda.core.contracts.SourceAndAmount<T, ? extends P>>, Object)
+  @NotNull
+  public final net.corda.core.contracts.AmountTransfer<T, P> copy(long, T, P, P)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.contracts.AmountTransfer fromDecimal(java.math.BigDecimal, Object, Object, Object)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.contracts.AmountTransfer fromDecimal(java.math.BigDecimal, Object, Object, Object, java.math.RoundingMode)
-  @org.jetbrains.annotations.NotNull public final Object getDestination()
+  @NotNull
+  public static final net.corda.core.contracts.AmountTransfer<T, P> fromDecimal(java.math.BigDecimal, T, P, P)
+  @NotNull
+  public static final net.corda.core.contracts.AmountTransfer<T, P> fromDecimal(java.math.BigDecimal, T, P, P, java.math.RoundingMode)
+  @NotNull
+  public final P getDestination()
   public final long getQuantityDelta()
-  @org.jetbrains.annotations.NotNull public final Object getSource()
-  @org.jetbrains.annotations.NotNull public final Object getToken()
+  @NotNull
+  public final P getSource()
+  @NotNull
+  public final T getToken()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public final List novate(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.AmountTransfer plus(net.corda.core.contracts.AmountTransfer)
-  @org.jetbrains.annotations.NotNull public final java.math.BigDecimal toDecimal()
-  @org.jetbrains.annotations.NotNull public String toString()
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.contracts.AmountTransfer zero(Object, Object, Object)
+  @NotNull
+  public final java.util.List<net.corda.core.contracts.AmountTransfer<T, P>> novate(P)
+  @NotNull
+  public final net.corda.core.contracts.AmountTransfer<T, P> plus(net.corda.core.contracts.AmountTransfer<T, P>)
+  @NotNull
+  public final java.math.BigDecimal toDecimal()
+  @NotNull
+  public String toString()
+  @NotNull
+  public static final net.corda.core.contracts.AmountTransfer<T, P> zero(T, P, P)
   public static final net.corda.core.contracts.AmountTransfer$Companion Companion
 ##
 public static final class net.corda.core.contracts.AmountTransfer$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.AmountTransfer fromDecimal(java.math.BigDecimal, Object, Object, Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.AmountTransfer fromDecimal(java.math.BigDecimal, Object, Object, Object, java.math.RoundingMode)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.AmountTransfer zero(Object, Object, Object)
+  @NotNull
+  public final net.corda.core.contracts.AmountTransfer<T, P> fromDecimal(java.math.BigDecimal, T, P, P)
+  @NotNull
+  public final net.corda.core.contracts.AmountTransfer<T, P> fromDecimal(java.math.BigDecimal, T, P, P, java.math.RoundingMode)
+  @NotNull
+  public final net.corda.core.contracts.AmountTransfer<T, P> zero(T, P, P)
 ##
-@net.corda.core.serialization.CordaSerializable public interface net.corda.core.contracts.Attachment extends net.corda.core.contracts.NamedByHash
+@CordaSerializable
+public interface net.corda.core.contracts.Attachment extends net.corda.core.contracts.NamedByHash
   public abstract void extractFile(String, java.io.OutputStream)
-  @org.jetbrains.annotations.NotNull public abstract List getSigners()
+  @NotNull
+  public abstract java.util.List<net.corda.core.identity.Party> getSigners()
   public abstract int getSize()
-  @org.jetbrains.annotations.NotNull public abstract java.io.InputStream open()
-  @org.jetbrains.annotations.NotNull public abstract jar.JarInputStream openAsJAR()
+  @NotNull
+  public abstract java.io.InputStream open()
+  @NotNull
+  public abstract java.util.jar.JarInputStream openAsJAR()
 ##
-@net.corda.core.DoNotImplement @net.corda.core.serialization.CordaSerializable public interface net.corda.core.contracts.AttachmentConstraint
+@DoNotImplement
+@CordaSerializable
+public interface net.corda.core.contracts.AttachmentConstraint
   public abstract boolean isSatisfiedBy(net.corda.core.contracts.Attachment)
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.contracts.AttachmentResolutionException extends net.corda.core.flows.FlowException
+@CordaSerializable
+public final class net.corda.core.contracts.AttachmentResolutionException extends net.corda.core.flows.FlowException
   public <init>(net.corda.core.crypto.SecureHash)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash getHash()
+  @NotNull
+  public final net.corda.core.crypto.SecureHash getHash()
 ##
-@net.corda.core.DoNotImplement @net.corda.core.serialization.CordaSerializable public final class net.corda.core.contracts.AutomaticHashConstraint extends java.lang.Object implements net.corda.core.contracts.AttachmentConstraint
+@DoNotImplement
+@CordaSerializable
+public final class net.corda.core.contracts.AutomaticHashConstraint extends java.lang.Object implements net.corda.core.contracts.AttachmentConstraint
   public boolean isSatisfiedBy(net.corda.core.contracts.Attachment)
   public static final net.corda.core.contracts.AutomaticHashConstraint INSTANCE
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.contracts.Command extends java.lang.Object
-  public <init>(net.corda.core.contracts.CommandData, java.security.PublicKey)
-  public <init>(net.corda.core.contracts.CommandData, List)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.CommandData component1()
-  @org.jetbrains.annotations.NotNull public final List component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.Command copy(net.corda.core.contracts.CommandData, List)
+@CordaSerializable
+public final class net.corda.core.contracts.Command extends java.lang.Object
+  public <init>(T, java.security.PublicKey)
+  public <init>(T, java.util.List<? extends java.security.PublicKey>)
+  @NotNull
+  public final T component1()
+  @NotNull
+  public final java.util.List<java.security.PublicKey> component2()
+  @NotNull
+  public final net.corda.core.contracts.Command<T> copy(T, java.util.List<? extends java.security.PublicKey>)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final List getSigners()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.CommandData getValue()
+  @NotNull
+  public final java.util.List<java.security.PublicKey> getSigners()
+  @NotNull
+  public final T getValue()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public String toString()
+  @NotNull
+  public String toString()
 ##
 public final class net.corda.core.contracts.CommandAndState extends java.lang.Object
   public <init>(net.corda.core.contracts.CommandData, net.corda.core.contracts.OwnableState)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.CommandData component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.OwnableState component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.CommandAndState copy(net.corda.core.contracts.CommandData, net.corda.core.contracts.OwnableState)
+  @NotNull
+  public final net.corda.core.contracts.CommandData component1()
+  @NotNull
+  public final net.corda.core.contracts.OwnableState component2()
+  @NotNull
+  public final net.corda.core.contracts.CommandAndState copy(net.corda.core.contracts.CommandData, net.corda.core.contracts.OwnableState)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.CommandData getCommand()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.OwnableState getOwnableState()
+  @NotNull
+  public final net.corda.core.contracts.CommandData getCommand()
+  @NotNull
+  public final net.corda.core.contracts.OwnableState getOwnableState()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public interface net.corda.core.contracts.CommandData
+@CordaSerializable
+public interface net.corda.core.contracts.CommandData
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.contracts.CommandWithParties extends java.lang.Object
-  public <init>(List, List, net.corda.core.contracts.CommandData)
-  @org.jetbrains.annotations.NotNull public final List component1()
-  @org.jetbrains.annotations.NotNull public final List component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.CommandData component3()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.CommandWithParties copy(List, List, net.corda.core.contracts.CommandData)
+@CordaSerializable
+public final class net.corda.core.contracts.CommandWithParties extends java.lang.Object
+  public <init>(java.util.List<? extends java.security.PublicKey>, java.util.List<net.corda.core.identity.Party>, T)
+  @NotNull
+  public final java.util.List<java.security.PublicKey> component1()
+  @NotNull
+  public final java.util.List<net.corda.core.identity.Party> component2()
+  @NotNull
+  public final T component3()
+  @NotNull
+  public final net.corda.core.contracts.CommandWithParties<T> copy(java.util.List<? extends java.security.PublicKey>, java.util.List<net.corda.core.identity.Party>, T)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final List getSigners()
-  @org.jetbrains.annotations.NotNull public final List getSigningParties()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.CommandData getValue()
+  @NotNull
+  public final java.util.List<java.security.PublicKey> getSigners()
+  @NotNull
+  public final java.util.List<net.corda.core.identity.Party> getSigningParties()
+  @NotNull
+  public final T getValue()
   public int hashCode()
   public String toString()
 ##
 public final class net.corda.core.contracts.ComponentGroupEnum extends java.lang.Enum
-  protected <init>(String, int)
+  protected <init>()
   public static net.corda.core.contracts.ComponentGroupEnum valueOf(String)
   public static net.corda.core.contracts.ComponentGroupEnum[] values()
 ##
-@net.corda.core.serialization.CordaSerializable public interface net.corda.core.contracts.Contract
+@CordaSerializable
+public interface net.corda.core.contracts.Contract
   public abstract void verify(net.corda.core.transactions.LedgerTransaction)
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.contracts.ContractAttachment extends java.lang.Object implements net.corda.core.contracts.Attachment
+@CordaSerializable
+public final class net.corda.core.contracts.ContractAttachment extends java.lang.Object implements net.corda.core.contracts.Attachment
   public <init>(net.corda.core.contracts.Attachment, String)
-  public <init>(net.corda.core.contracts.Attachment, String, Set)
-  public <init>(net.corda.core.contracts.Attachment, String, Set, String)
+  public <init>(net.corda.core.contracts.Attachment, String, java.util.Set<String>)
+  public <init>(net.corda.core.contracts.Attachment, String, java.util.Set<String>, String)
   public void extractFile(String, java.io.OutputStream)
-  @org.jetbrains.annotations.NotNull public final Set getAdditionalContracts()
-  @org.jetbrains.annotations.NotNull public final Set getAllContracts()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.Attachment getAttachment()
-  @org.jetbrains.annotations.NotNull public final String getContract()
-  @org.jetbrains.annotations.NotNull public net.corda.core.crypto.SecureHash getId()
-  @org.jetbrains.annotations.NotNull public List getSigners()
+  @NotNull
+  public final java.util.Set<String> getAdditionalContracts()
+  @NotNull
+  public final java.util.Set<String> getAllContracts()
+  @NotNull
+  public final net.corda.core.contracts.Attachment getAttachment()
+  @NotNull
+  public final String getContract()
+  @NotNull
+  public net.corda.core.crypto.SecureHash getId()
+  @NotNull
+  public java.util.List<net.corda.core.identity.Party> getSigners()
   public int getSize()
-  @org.jetbrains.annotations.Nullable public final String getUploader()
-  @org.jetbrains.annotations.NotNull public java.io.InputStream open()
-  @org.jetbrains.annotations.NotNull public jar.JarInputStream openAsJAR()
-  @org.jetbrains.annotations.NotNull public String toString()
+  @Nullable
+  public final String getUploader()
+  @NotNull
+  public java.io.InputStream open()
+  @NotNull
+  public java.util.jar.JarInputStream openAsJAR()
+  @NotNull
+  public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public interface net.corda.core.contracts.ContractState
-  @org.jetbrains.annotations.NotNull public abstract List getParticipants()
+@CordaSerializable
+public interface net.corda.core.contracts.ContractState
+  @NotNull
+  public abstract java.util.List<net.corda.core.identity.AbstractParty> getParticipants()
 ##
 public final class net.corda.core.contracts.ContractsDSL extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.contracts.CommandWithParties requireSingleCommand(Collection, Class)
-  public static final Object requireThat(kotlin.jvm.functions.Function1)
-  @org.jetbrains.annotations.NotNull public static final List select(Collection, Class, java.security.PublicKey, net.corda.core.identity.AbstractParty)
-  @org.jetbrains.annotations.NotNull public static final List select(Collection, Class, Collection, Collection)
+  @NotNull
+  public static final net.corda.core.contracts.CommandWithParties<C> requireSingleCommand(java.util.Collection<? extends net.corda.core.contracts.CommandWithParties<? extends net.corda.core.contracts.CommandData>>, Class<C>)
+  public static final R requireThat(kotlin.jvm.functions.Function1<? super net.corda.core.contracts.Requirements, ? extends R>)
+  @NotNull
+  public static final java.util.List<net.corda.core.contracts.CommandWithParties<C>> select(java.util.Collection<? extends net.corda.core.contracts.CommandWithParties<? extends net.corda.core.contracts.CommandData>>, Class<C>, java.security.PublicKey, net.corda.core.identity.AbstractParty)
+  @NotNull
+  public static final java.util.List<net.corda.core.contracts.CommandWithParties<C>> select(java.util.Collection<? extends net.corda.core.contracts.CommandWithParties<? extends net.corda.core.contracts.CommandData>>, Class<C>, java.util.Collection<? extends java.security.PublicKey>, java.util.Collection<net.corda.core.identity.Party>)
 ##
-@net.corda.core.serialization.CordaSerializable public interface net.corda.core.contracts.FungibleAsset extends net.corda.core.contracts.OwnableState
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.contracts.Amount getAmount()
-  @org.jetbrains.annotations.NotNull public abstract Collection getExitKeys()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.contracts.FungibleAsset withNewOwnerAndAmount(net.corda.core.contracts.Amount, net.corda.core.identity.AbstractParty)
+@CordaSerializable
+public interface net.corda.core.contracts.FungibleAsset extends net.corda.core.contracts.OwnableState
+  @NotNull
+  public abstract net.corda.core.contracts.Amount<net.corda.core.contracts.Issued<T>> getAmount()
+  @NotNull
+  public abstract java.util.Collection<java.security.PublicKey> getExitKeys()
+  @NotNull
+  public abstract net.corda.core.contracts.FungibleAsset<T> withNewOwnerAndAmount(net.corda.core.contracts.Amount<net.corda.core.contracts.Issued<T>>, net.corda.core.identity.AbstractParty)
 ##
-@net.corda.core.DoNotImplement @net.corda.core.serialization.CordaSerializable public final class net.corda.core.contracts.HashAttachmentConstraint extends java.lang.Object implements net.corda.core.contracts.AttachmentConstraint
+@DoNotImplement
+@CordaSerializable
+public final class net.corda.core.contracts.HashAttachmentConstraint extends java.lang.Object implements net.corda.core.contracts.AttachmentConstraint
   public <init>(net.corda.core.crypto.SecureHash)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.HashAttachmentConstraint copy(net.corda.core.crypto.SecureHash)
+  @NotNull
+  public final net.corda.core.crypto.SecureHash component1()
+  @NotNull
+  public final net.corda.core.contracts.HashAttachmentConstraint copy(net.corda.core.crypto.SecureHash)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash getAttachmentId()
+  @NotNull
+  public final net.corda.core.crypto.SecureHash getAttachmentId()
   public int hashCode()
   public boolean isSatisfiedBy(net.corda.core.contracts.Attachment)
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.contracts.InsufficientBalanceException extends net.corda.core.flows.FlowException
-  public <init>(net.corda.core.contracts.Amount)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.Amount getAmountMissing()
+@CordaSerializable
+public final class net.corda.core.contracts.InsufficientBalanceException extends net.corda.core.flows.FlowException
+  public <init>(net.corda.core.contracts.Amount<?>)
+  @NotNull
+  public final net.corda.core.contracts.Amount<?> getAmountMissing()
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.contracts.Issued extends java.lang.Object
-  public <init>(net.corda.core.contracts.PartyAndReference, Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.PartyAndReference component1()
-  @org.jetbrains.annotations.NotNull public final Object component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.Issued copy(net.corda.core.contracts.PartyAndReference, Object)
+@CordaSerializable
+public final class net.corda.core.contracts.Issued extends java.lang.Object
+  public <init>(net.corda.core.contracts.PartyAndReference, P)
+  @NotNull
+  public final net.corda.core.contracts.PartyAndReference component1()
+  @NotNull
+  public final P component2()
+  @NotNull
+  public final net.corda.core.contracts.Issued<P> copy(net.corda.core.contracts.PartyAndReference, P)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.PartyAndReference getIssuer()
-  @org.jetbrains.annotations.NotNull public final Object getProduct()
+  @NotNull
+  public final net.corda.core.contracts.PartyAndReference getIssuer()
+  @NotNull
+  public final P getProduct()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public String toString()
+  @NotNull
+  public String toString()
 ##
 public @interface net.corda.core.contracts.LegalProseReference
   public abstract String uri()
 ##
-@net.corda.core.serialization.CordaSerializable public interface net.corda.core.contracts.LinearState extends net.corda.core.contracts.ContractState
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.contracts.UniqueIdentifier getLinearId()
+@CordaSerializable
+public interface net.corda.core.contracts.LinearState extends net.corda.core.contracts.ContractState
+  @NotNull
+  public abstract net.corda.core.contracts.UniqueIdentifier getLinearId()
 ##
-@net.corda.core.serialization.CordaSerializable public interface net.corda.core.contracts.MoveCommand extends net.corda.core.contracts.CommandData
-  @org.jetbrains.annotations.Nullable public abstract Class getContract()
+@CordaSerializable
+public interface net.corda.core.contracts.MoveCommand extends net.corda.core.contracts.CommandData
+  @Nullable
+  public abstract Class<? extends net.corda.core.contracts.Contract> getContract()
 ##
 public interface net.corda.core.contracts.NamedByHash
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.crypto.SecureHash getId()
+  @NotNull
+  public abstract net.corda.core.crypto.SecureHash getId()
 ##
-@net.corda.core.serialization.CordaSerializable public interface net.corda.core.contracts.OwnableState extends net.corda.core.contracts.ContractState
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.identity.AbstractParty getOwner()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.contracts.CommandAndState withNewOwner(net.corda.core.identity.AbstractParty)
+@CordaSerializable
+public interface net.corda.core.contracts.OwnableState extends net.corda.core.contracts.ContractState
+  @NotNull
+  public abstract net.corda.core.identity.AbstractParty getOwner()
+  @NotNull
+  public abstract net.corda.core.contracts.CommandAndState withNewOwner(net.corda.core.identity.AbstractParty)
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.contracts.PartyAndReference extends java.lang.Object
+@CordaSerializable
+public final class net.corda.core.contracts.PartyAndReference extends java.lang.Object
   public <init>(net.corda.core.identity.AbstractParty, net.corda.core.utilities.OpaqueBytes)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.AbstractParty component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.OpaqueBytes component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.PartyAndReference copy(net.corda.core.identity.AbstractParty, net.corda.core.utilities.OpaqueBytes)
+  @NotNull
+  public final net.corda.core.identity.AbstractParty component1()
+  @NotNull
+  public final net.corda.core.utilities.OpaqueBytes component2()
+  @NotNull
+  public final net.corda.core.contracts.PartyAndReference copy(net.corda.core.identity.AbstractParty, net.corda.core.utilities.OpaqueBytes)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.AbstractParty getParty()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.OpaqueBytes getReference()
+  @NotNull
+  public final net.corda.core.identity.AbstractParty getParty()
+  @NotNull
+  public final net.corda.core.utilities.OpaqueBytes getReference()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public String toString()
+  @NotNull
+  public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.contracts.PrivacySalt extends net.corda.core.utilities.OpaqueBytes
+@CordaSerializable
+public final class net.corda.core.contracts.PrivacySalt extends net.corda.core.utilities.OpaqueBytes
   public <init>()
   public <init>(byte[])
 ##
@@ -430,258 +662,371 @@ public final class net.corda.core.contracts.Requirements extends java.lang.Objec
   public final void using(String, boolean)
   public static final net.corda.core.contracts.Requirements INSTANCE
 ##
-@net.corda.core.serialization.CordaSerializable public interface net.corda.core.contracts.SchedulableState extends net.corda.core.contracts.ContractState
-  @org.jetbrains.annotations.Nullable public abstract net.corda.core.contracts.ScheduledActivity nextScheduledActivity(net.corda.core.contracts.StateRef, net.corda.core.flows.FlowLogicRefFactory)
+@CordaSerializable
+public interface net.corda.core.contracts.SchedulableState extends net.corda.core.contracts.ContractState
+  @Nullable
+  public abstract net.corda.core.contracts.ScheduledActivity nextScheduledActivity(net.corda.core.contracts.StateRef, net.corda.core.flows.FlowLogicRefFactory)
 ##
 public interface net.corda.core.contracts.Scheduled
-  @org.jetbrains.annotations.NotNull public abstract java.time.Instant getScheduledAt()
+  @NotNull
+  public abstract java.time.Instant getScheduledAt()
 ##
 public final class net.corda.core.contracts.ScheduledActivity extends java.lang.Object implements net.corda.core.contracts.Scheduled
   public <init>(net.corda.core.flows.FlowLogicRef, java.time.Instant)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.FlowLogicRef component1()
-  @org.jetbrains.annotations.NotNull public final java.time.Instant component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.ScheduledActivity copy(net.corda.core.flows.FlowLogicRef, java.time.Instant)
+  @NotNull
+  public final net.corda.core.flows.FlowLogicRef component1()
+  @NotNull
+  public final java.time.Instant component2()
+  @NotNull
+  public final net.corda.core.contracts.ScheduledActivity copy(net.corda.core.flows.FlowLogicRef, java.time.Instant)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.FlowLogicRef getLogicRef()
-  @org.jetbrains.annotations.NotNull public java.time.Instant getScheduledAt()
+  @NotNull
+  public final net.corda.core.flows.FlowLogicRef getLogicRef()
+  @NotNull
+  public java.time.Instant getScheduledAt()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.contracts.ScheduledStateRef extends java.lang.Object implements net.corda.core.contracts.Scheduled
+@CordaSerializable
+public final class net.corda.core.contracts.ScheduledStateRef extends java.lang.Object implements net.corda.core.contracts.Scheduled
   public <init>(net.corda.core.contracts.StateRef, java.time.Instant)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.StateRef component1()
-  @org.jetbrains.annotations.NotNull public final java.time.Instant component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.ScheduledStateRef copy(net.corda.core.contracts.StateRef, java.time.Instant)
+  @NotNull
+  public final net.corda.core.contracts.StateRef component1()
+  @NotNull
+  public final java.time.Instant component2()
+  @NotNull
+  public final net.corda.core.contracts.ScheduledStateRef copy(net.corda.core.contracts.StateRef, java.time.Instant)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.StateRef getRef()
-  @org.jetbrains.annotations.NotNull public java.time.Instant getScheduledAt()
+  @NotNull
+  public final net.corda.core.contracts.StateRef getRef()
+  @NotNull
+  public java.time.Instant getScheduledAt()
   public int hashCode()
   public String toString()
 ##
 public final class net.corda.core.contracts.SourceAndAmount extends java.lang.Object
-  public <init>(Object, net.corda.core.contracts.Amount, Object)
-  @org.jetbrains.annotations.NotNull public final Object component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.Amount component2()
-  @org.jetbrains.annotations.Nullable public final Object component3()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.SourceAndAmount copy(Object, net.corda.core.contracts.Amount, Object)
+  public <init>(P, net.corda.core.contracts.Amount<T>, Object)
+  @NotNull
+  public final P component1()
+  @NotNull
+  public final net.corda.core.contracts.Amount<T> component2()
+  @Nullable
+  public final Object component3()
+  @NotNull
+  public final net.corda.core.contracts.SourceAndAmount<T, P> copy(P, net.corda.core.contracts.Amount<T>, Object)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.Amount getAmount()
-  @org.jetbrains.annotations.Nullable public final Object getRef()
-  @org.jetbrains.annotations.NotNull public final Object getSource()
+  @NotNull
+  public final net.corda.core.contracts.Amount<T> getAmount()
+  @Nullable
+  public final Object getRef()
+  @NotNull
+  public final P getSource()
   public int hashCode()
   public String toString()
 ##
 public final class net.corda.core.contracts.StateAndContract extends java.lang.Object
   public <init>(net.corda.core.contracts.ContractState, String)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.ContractState component1()
-  @org.jetbrains.annotations.NotNull public final String component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.StateAndContract copy(net.corda.core.contracts.ContractState, String)
+  @NotNull
+  public final net.corda.core.contracts.ContractState component1()
+  @NotNull
+  public final String component2()
+  @NotNull
+  public final net.corda.core.contracts.StateAndContract copy(net.corda.core.contracts.ContractState, String)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final String getContract()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.ContractState getState()
+  @NotNull
+  public final String getContract()
+  @NotNull
+  public final net.corda.core.contracts.ContractState getState()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.contracts.StateAndRef extends java.lang.Object
-  public <init>(net.corda.core.contracts.TransactionState, net.corda.core.contracts.StateRef)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.TransactionState component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.StateRef component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.StateAndRef copy(net.corda.core.contracts.TransactionState, net.corda.core.contracts.StateRef)
+@CordaSerializable
+public final class net.corda.core.contracts.StateAndRef extends java.lang.Object
+  public <init>(net.corda.core.contracts.TransactionState<? extends T>, net.corda.core.contracts.StateRef)
+  @NotNull
+  public final net.corda.core.contracts.TransactionState<T> component1()
+  @NotNull
+  public final net.corda.core.contracts.StateRef component2()
+  @NotNull
+  public final net.corda.core.contracts.StateAndRef<T> copy(net.corda.core.contracts.TransactionState<? extends T>, net.corda.core.contracts.StateRef)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.StateRef getRef()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.TransactionState getState()
+  @NotNull
+  public final net.corda.core.contracts.StateRef getRef()
+  @NotNull
+  public final net.corda.core.contracts.TransactionState<T> getState()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.contracts.StateRef extends java.lang.Object
+@CordaSerializable
+public final class net.corda.core.contracts.StateRef extends java.lang.Object
   public <init>(net.corda.core.crypto.SecureHash, int)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash component1()
+  @NotNull
+  public final net.corda.core.crypto.SecureHash component1()
   public final int component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.StateRef copy(net.corda.core.crypto.SecureHash, int)
+  @NotNull
+  public final net.corda.core.contracts.StateRef copy(net.corda.core.crypto.SecureHash, int)
   public boolean equals(Object)
   public final int getIndex()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash getTxhash()
+  @NotNull
+  public final net.corda.core.crypto.SecureHash getTxhash()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public String toString()
+  @NotNull
+  public String toString()
 ##
 public final class net.corda.core.contracts.Structures extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.crypto.SecureHash hash(net.corda.core.contracts.ContractState)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.contracts.Amount withoutIssuer(net.corda.core.contracts.Amount)
+  @NotNull
+  public static final net.corda.core.crypto.SecureHash hash(net.corda.core.contracts.ContractState)
+  @NotNull
+  public static final net.corda.core.contracts.Amount<T> withoutIssuer(net.corda.core.contracts.Amount<net.corda.core.contracts.Issued<T>>)
   public static final int MAX_ISSUER_REF_SIZE = 512
 ##
-@net.corda.core.serialization.CordaSerializable public abstract class net.corda.core.contracts.TimeWindow extends java.lang.Object
+@CordaSerializable
+public abstract class net.corda.core.contracts.TimeWindow extends java.lang.Object
   public <init>()
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.contracts.TimeWindow between(java.time.Instant, java.time.Instant)
+  @NotNull
+  public static final net.corda.core.contracts.TimeWindow between(java.time.Instant, java.time.Instant)
   public abstract boolean contains(java.time.Instant)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.contracts.TimeWindow fromOnly(java.time.Instant)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.contracts.TimeWindow fromStartAndDuration(java.time.Instant, java.time.Duration)
-  @org.jetbrains.annotations.Nullable public abstract java.time.Instant getFromTime()
-  @org.jetbrains.annotations.Nullable public final java.time.Duration getLength()
-  @org.jetbrains.annotations.Nullable public abstract java.time.Instant getMidpoint()
-  @org.jetbrains.annotations.Nullable public abstract java.time.Instant getUntilTime()
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.contracts.TimeWindow untilOnly(java.time.Instant)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.contracts.TimeWindow withTolerance(java.time.Instant, java.time.Duration)
+  @NotNull
+  public static final net.corda.core.contracts.TimeWindow fromOnly(java.time.Instant)
+  @NotNull
+  public static final net.corda.core.contracts.TimeWindow fromStartAndDuration(java.time.Instant, java.time.Duration)
+  @Nullable
+  public abstract java.time.Instant getFromTime()
+  @Nullable
+  public final java.time.Duration getLength()
+  @Nullable
+  public abstract java.time.Instant getMidpoint()
+  @Nullable
+  public abstract java.time.Instant getUntilTime()
+  @NotNull
+  public static final net.corda.core.contracts.TimeWindow untilOnly(java.time.Instant)
+  @NotNull
+  public static final net.corda.core.contracts.TimeWindow withTolerance(java.time.Instant, java.time.Duration)
   public static final net.corda.core.contracts.TimeWindow$Companion Companion
 ##
 public static final class net.corda.core.contracts.TimeWindow$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.TimeWindow between(java.time.Instant, java.time.Instant)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.TimeWindow fromOnly(java.time.Instant)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.TimeWindow fromStartAndDuration(java.time.Instant, java.time.Duration)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.TimeWindow untilOnly(java.time.Instant)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.TimeWindow withTolerance(java.time.Instant, java.time.Duration)
+  @NotNull
+  public final net.corda.core.contracts.TimeWindow between(java.time.Instant, java.time.Instant)
+  @NotNull
+  public final net.corda.core.contracts.TimeWindow fromOnly(java.time.Instant)
+  @NotNull
+  public final net.corda.core.contracts.TimeWindow fromStartAndDuration(java.time.Instant, java.time.Duration)
+  @NotNull
+  public final net.corda.core.contracts.TimeWindow untilOnly(java.time.Instant)
+  @NotNull
+  public final net.corda.core.contracts.TimeWindow withTolerance(java.time.Instant, java.time.Duration)
 ##
 public interface net.corda.core.contracts.TokenizableAssetInfo
-  @org.jetbrains.annotations.NotNull public abstract java.math.BigDecimal getDisplayTokenSize()
+  @NotNull
+  public abstract java.math.BigDecimal getDisplayTokenSize()
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.contracts.TransactionResolutionException extends net.corda.core.flows.FlowException
+@CordaSerializable
+public final class net.corda.core.contracts.TransactionResolutionException extends net.corda.core.flows.FlowException
   public <init>(net.corda.core.crypto.SecureHash)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash getHash()
+  @NotNull
+  public final net.corda.core.crypto.SecureHash getHash()
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.contracts.TransactionState extends java.lang.Object
-  public <init>(net.corda.core.contracts.ContractState, String, net.corda.core.identity.Party)
-  public <init>(net.corda.core.contracts.ContractState, String, net.corda.core.identity.Party, Integer)
-  public <init>(net.corda.core.contracts.ContractState, String, net.corda.core.identity.Party, Integer, net.corda.core.contracts.AttachmentConstraint)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.ContractState component1()
-  @org.jetbrains.annotations.NotNull public final String component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.Party component3()
-  @org.jetbrains.annotations.Nullable public final Integer component4()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.AttachmentConstraint component5()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.TransactionState copy(net.corda.core.contracts.ContractState, String, net.corda.core.identity.Party, Integer, net.corda.core.contracts.AttachmentConstraint)
+@CordaSerializable
+public final class net.corda.core.contracts.TransactionState extends java.lang.Object
+  public <init>(T, String, net.corda.core.identity.Party)
+  public <init>(T, String, net.corda.core.identity.Party, Integer)
+  public <init>(T, String, net.corda.core.identity.Party, Integer, net.corda.core.contracts.AttachmentConstraint)
+  @NotNull
+  public final T component1()
+  @NotNull
+  public final String component2()
+  @NotNull
+  public final net.corda.core.identity.Party component3()
+  @Nullable
+  public final Integer component4()
+  @NotNull
+  public final net.corda.core.contracts.AttachmentConstraint component5()
+  @NotNull
+  public final net.corda.core.contracts.TransactionState<T> copy(T, String, net.corda.core.identity.Party, Integer, net.corda.core.contracts.AttachmentConstraint)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.AttachmentConstraint getConstraint()
-  @org.jetbrains.annotations.NotNull public final String getContract()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.ContractState getData()
-  @org.jetbrains.annotations.Nullable public final Integer getEncumbrance()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.Party getNotary()
+  @NotNull
+  public final net.corda.core.contracts.AttachmentConstraint getConstraint()
+  @NotNull
+  public final String getContract()
+  @NotNull
+  public final T getData()
+  @Nullable
+  public final Integer getEncumbrance()
+  @NotNull
+  public final net.corda.core.identity.Party getNotary()
   public int hashCode()
   public String toString()
 ##
 public final class net.corda.core.contracts.TransactionStateKt extends java.lang.Object
 ##
-@net.corda.core.serialization.CordaSerializable public abstract class net.corda.core.contracts.TransactionVerificationException extends net.corda.core.flows.FlowException
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash getTxId()
+@CordaSerializable
+public abstract class net.corda.core.contracts.TransactionVerificationException extends net.corda.core.flows.FlowException
+  @NotNull
+  public final net.corda.core.crypto.SecureHash getTxId()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$ConflictingAttachmentsRejection extends net.corda.core.contracts.TransactionVerificationException
+@CordaSerializable
+public static final class net.corda.core.contracts.TransactionVerificationException$ConflictingAttachmentsRejection extends net.corda.core.contracts.TransactionVerificationException
   public <init>(net.corda.core.crypto.SecureHash, String)
-  @org.jetbrains.annotations.NotNull public final String getContractClass()
+  @NotNull
+  public final String getContractClass()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$ContractConstraintRejection extends net.corda.core.contracts.TransactionVerificationException
+@CordaSerializable
+public static final class net.corda.core.contracts.TransactionVerificationException$ContractConstraintRejection extends net.corda.core.contracts.TransactionVerificationException
   public <init>(net.corda.core.crypto.SecureHash, String)
-  @org.jetbrains.annotations.NotNull public final String getContractClass()
+  @NotNull
+  public final String getContractClass()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$ContractCreationError extends net.corda.core.contracts.TransactionVerificationException
+@CordaSerializable
+public static final class net.corda.core.contracts.TransactionVerificationException$ContractCreationError extends net.corda.core.contracts.TransactionVerificationException
   public <init>(net.corda.core.crypto.SecureHash, String, Throwable)
-  @org.jetbrains.annotations.NotNull public final String getContractClass()
+  @NotNull
+  public final String getContractClass()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$ContractRejection extends net.corda.core.contracts.TransactionVerificationException
+@CordaSerializable
+public static final class net.corda.core.contracts.TransactionVerificationException$ContractRejection extends net.corda.core.contracts.TransactionVerificationException
   public <init>(net.corda.core.crypto.SecureHash, String, Throwable)
   public <init>(net.corda.core.crypto.SecureHash, net.corda.core.contracts.Contract, Throwable)
-  @org.jetbrains.annotations.NotNull public final String getContractClass()
+  @NotNull
+  public final String getContractClass()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$Direction extends java.lang.Enum
-  protected <init>(String, int)
+@CordaSerializable
+public static final class net.corda.core.contracts.TransactionVerificationException$Direction extends java.lang.Enum
+  protected <init>()
   public static net.corda.core.contracts.TransactionVerificationException$Direction valueOf(String)
   public static net.corda.core.contracts.TransactionVerificationException$Direction[] values()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$DuplicateInputStates extends net.corda.core.contracts.TransactionVerificationException
-  public <init>(net.corda.core.crypto.SecureHash, net.corda.core.utilities.NonEmptySet)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.NonEmptySet getDuplicates()
+@CordaSerializable
+public static final class net.corda.core.contracts.TransactionVerificationException$DuplicateInputStates extends net.corda.core.contracts.TransactionVerificationException
+  public <init>(net.corda.core.crypto.SecureHash, net.corda.core.utilities.NonEmptySet<net.corda.core.contracts.StateRef>)
+  @NotNull
+  public final net.corda.core.utilities.NonEmptySet<net.corda.core.contracts.StateRef> getDuplicates()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$InvalidNotaryChange extends net.corda.core.contracts.TransactionVerificationException
+@CordaSerializable
+public static final class net.corda.core.contracts.TransactionVerificationException$InvalidNotaryChange extends net.corda.core.contracts.TransactionVerificationException
   public <init>(net.corda.core.crypto.SecureHash)
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$MissingAttachmentRejection extends net.corda.core.contracts.TransactionVerificationException
+@CordaSerializable
+public static final class net.corda.core.contracts.TransactionVerificationException$MissingAttachmentRejection extends net.corda.core.contracts.TransactionVerificationException
   public <init>(net.corda.core.crypto.SecureHash, String)
-  @org.jetbrains.annotations.NotNull public final String getContractClass()
+  @NotNull
+  public final String getContractClass()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$MoreThanOneNotary extends net.corda.core.contracts.TransactionVerificationException
+@CordaSerializable
+public static final class net.corda.core.contracts.TransactionVerificationException$MoreThanOneNotary extends net.corda.core.contracts.TransactionVerificationException
   public <init>(net.corda.core.crypto.SecureHash)
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$NotaryChangeInWrongTransactionType extends net.corda.core.contracts.TransactionVerificationException
+@CordaSerializable
+public static final class net.corda.core.contracts.TransactionVerificationException$NotaryChangeInWrongTransactionType extends net.corda.core.contracts.TransactionVerificationException
   public <init>(net.corda.core.crypto.SecureHash, net.corda.core.identity.Party, net.corda.core.identity.Party)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.Party getOutputNotary()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.Party getTxNotary()
+  @NotNull
+  public final net.corda.core.identity.Party getOutputNotary()
+  @NotNull
+  public final net.corda.core.identity.Party getTxNotary()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$SignersMissing extends net.corda.core.contracts.TransactionVerificationException
-  public <init>(net.corda.core.crypto.SecureHash, List)
-  @org.jetbrains.annotations.NotNull public final List getMissing()
+@CordaSerializable
+public static final class net.corda.core.contracts.TransactionVerificationException$SignersMissing extends net.corda.core.contracts.TransactionVerificationException
+  public <init>(net.corda.core.crypto.SecureHash, java.util.List<? extends java.security.PublicKey>)
+  @NotNull
+  public final java.util.List<java.security.PublicKey> getMissing()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.contracts.TransactionVerificationException$TransactionMissingEncumbranceException extends net.corda.core.contracts.TransactionVerificationException
+@CordaSerializable
+public static final class net.corda.core.contracts.TransactionVerificationException$TransactionMissingEncumbranceException extends net.corda.core.contracts.TransactionVerificationException
   public <init>(net.corda.core.crypto.SecureHash, int, net.corda.core.contracts.TransactionVerificationException$Direction)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.TransactionVerificationException$Direction getInOut()
+  @NotNull
+  public final net.corda.core.contracts.TransactionVerificationException$Direction getInOut()
   public final int getMissing()
 ##
-@net.corda.core.serialization.CordaSerializable public abstract class net.corda.core.contracts.TypeOnlyCommandData extends java.lang.Object implements net.corda.core.contracts.CommandData
+@CordaSerializable
+public abstract class net.corda.core.contracts.TypeOnlyCommandData extends java.lang.Object implements net.corda.core.contracts.CommandData
   public <init>()
   public boolean equals(Object)
   public int hashCode()
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.contracts.UniqueIdentifier extends java.lang.Object implements java.lang.Comparable
+@CordaSerializable
+public final class net.corda.core.contracts.UniqueIdentifier extends java.lang.Object implements java.lang.Comparable
   public <init>()
-  public <init>(String, UUID)
+  public <init>(String, java.util.UUID)
   public int compareTo(net.corda.core.contracts.UniqueIdentifier)
-  @org.jetbrains.annotations.Nullable public final String component1()
-  @org.jetbrains.annotations.NotNull public final UUID component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.UniqueIdentifier copy(String, UUID)
+  @Nullable
+  public final String component1()
+  @NotNull
+  public final java.util.UUID component2()
+  @NotNull
+  public final net.corda.core.contracts.UniqueIdentifier copy(String, java.util.UUID)
   public boolean equals(Object)
-  @org.jetbrains.annotations.Nullable public final String getExternalId()
-  @org.jetbrains.annotations.NotNull public final UUID getId()
+  @Nullable
+  public final String getExternalId()
+  @NotNull
+  public final java.util.UUID getId()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public String toString()
+  @NotNull
+  public String toString()
   public static final net.corda.core.contracts.UniqueIdentifier$Companion Companion
 ##
 public static final class net.corda.core.contracts.UniqueIdentifier$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.UniqueIdentifier fromString(String)
+  @NotNull
+  public final net.corda.core.contracts.UniqueIdentifier fromString(String)
 ##
-@net.corda.core.serialization.CordaSerializable public interface net.corda.core.contracts.UpgradedContract extends net.corda.core.contracts.Contract
-  @org.jetbrains.annotations.NotNull public abstract String getLegacyContract()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.contracts.ContractState upgrade(net.corda.core.contracts.ContractState)
+@CordaSerializable
+public interface net.corda.core.contracts.UpgradedContract extends net.corda.core.contracts.Contract
+  @NotNull
+  public abstract String getLegacyContract()
+  @NotNull
+  public abstract NewState upgrade(OldState)
 ##
-@net.corda.core.serialization.CordaSerializable public interface net.corda.core.contracts.UpgradedContractWithLegacyConstraint extends net.corda.core.contracts.UpgradedContract
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.contracts.AttachmentConstraint getLegacyContractConstraint()
+@CordaSerializable
+public interface net.corda.core.contracts.UpgradedContractWithLegacyConstraint extends net.corda.core.contracts.UpgradedContract
+  @NotNull
+  public abstract net.corda.core.contracts.AttachmentConstraint getLegacyContractConstraint()
 ##
-@net.corda.core.DoNotImplement @net.corda.core.serialization.CordaSerializable public final class net.corda.core.contracts.WhitelistedByZoneAttachmentConstraint extends java.lang.Object implements net.corda.core.contracts.AttachmentConstraint
+@DoNotImplement
+@CordaSerializable
+public final class net.corda.core.contracts.WhitelistedByZoneAttachmentConstraint extends java.lang.Object implements net.corda.core.contracts.AttachmentConstraint
   public boolean isSatisfiedBy(net.corda.core.contracts.Attachment)
   public static final net.corda.core.contracts.WhitelistedByZoneAttachmentConstraint INSTANCE
 ##
-@net.corda.core.DoNotImplement public interface net.corda.core.cordapp.Cordapp
-  @org.jetbrains.annotations.NotNull public abstract List getContractClassNames()
-  @org.jetbrains.annotations.NotNull public abstract List getCordappClasses()
-  @org.jetbrains.annotations.NotNull public abstract Set getCustomSchemas()
-  @org.jetbrains.annotations.NotNull public abstract List getInitiatedFlows()
-  @org.jetbrains.annotations.NotNull public abstract java.net.URL getJarPath()
-  @org.jetbrains.annotations.NotNull public abstract String getName()
-  @org.jetbrains.annotations.NotNull public abstract List getRpcFlows()
-  @org.jetbrains.annotations.NotNull public abstract List getSchedulableFlows()
-  @org.jetbrains.annotations.NotNull public abstract List getSerializationCustomSerializers()
-  @org.jetbrains.annotations.NotNull public abstract List getSerializationWhitelists()
-  @org.jetbrains.annotations.NotNull public abstract List getServiceFlows()
-  @org.jetbrains.annotations.NotNull public abstract List getServices()
-##
-@net.corda.core.DoNotImplement public interface net.corda.core.cordapp.CordappConfig
-  public abstract boolean exists(String)
-  @org.jetbrains.annotations.NotNull public abstract Object get(String)
-  public abstract boolean getBoolean(String)
-  public abstract double getDouble(String)
-  public abstract float getFloat(String)
-  public abstract int getInt(String)
-  public abstract long getLong(String)
-  @org.jetbrains.annotations.NotNull public abstract Number getNumber(String)
-  @org.jetbrains.annotations.NotNull public abstract String getString(String)
-##
-public final class net.corda.core.cordapp.CordappConfigException extends java.lang.Exception
-  public <init>(String, Throwable)
+@DoNotImplement
+public interface net.corda.core.cordapp.Cordapp
+  @NotNull
+  public abstract java.util.List<String> getContractClassNames()
+  @NotNull
+  public abstract java.util.List<String> getCordappClasses()
+  @NotNull
+  public abstract java.util.Set<net.corda.core.schemas.MappedSchema> getCustomSchemas()
+  @NotNull
+  public abstract java.util.List<Class<? extends net.corda.core.flows.FlowLogic<?>>> getInitiatedFlows()
+  @NotNull
+  public abstract java.net.URL getJarPath()
+  @NotNull
+  public abstract String getName()
+  @NotNull
+  public abstract java.util.List<Class<? extends net.corda.core.flows.FlowLogic<?>>> getRpcFlows()
+  @NotNull
+  public abstract java.util.List<Class<? extends net.corda.core.flows.FlowLogic<?>>> getSchedulableFlows()
+  @NotNull
+  public abstract java.util.List<net.corda.core.serialization.SerializationCustomSerializer<?, ?>> getSerializationCustomSerializers()
+  @NotNull
+  public abstract java.util.List<net.corda.core.serialization.SerializationWhitelist> getSerializationWhitelists()
+  @NotNull
+  public abstract java.util.List<Class<? extends net.corda.core.flows.FlowLogic<?>>> getServiceFlows()
+  @NotNull
+  public abstract java.util.List<Class<? extends net.corda.core.serialization.SerializeAsToken>> getServices()
 ##
 public final class net.corda.core.cordapp.CordappContext extends java.lang.Object
   public <init>(net.corda.core.cordapp.Cordapp, net.corda.core.crypto.SecureHash, ClassLoader, net.corda.core.cordapp.CordappConfig)
-  @org.jetbrains.annotations.Nullable public final net.corda.core.crypto.SecureHash getAttachmentId()
-  @org.jetbrains.annotations.NotNull public final ClassLoader getClassLoader()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.cordapp.CordappConfig getConfig()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.cordapp.Cordapp getCordapp()
+  @Nullable
+  public final net.corda.core.crypto.SecureHash getAttachmentId()
+  @NotNull
+  public final ClassLoader getClassLoader()
+  @NotNull
+  public final net.corda.core.cordapp.Cordapp getCordapp()
 ##
-@net.corda.core.DoNotImplement public interface net.corda.core.cordapp.CordappProvider
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.cordapp.CordappContext getAppContext()
-  @org.jetbrains.annotations.Nullable public abstract net.corda.core.crypto.SecureHash getContractAttachmentID(String)
+@DoNotImplement
+public interface net.corda.core.cordapp.CordappProvider
+  @NotNull
+  public abstract net.corda.core.cordapp.CordappContext getAppContext()
+  @Nullable
+  public abstract net.corda.core.crypto.SecureHash getContractAttachmentID(String)
 ##
 public class net.corda.core.crypto.AddressFormatException extends java.lang.IllegalArgumentException
   public <init>()
@@ -694,328 +1039,491 @@ public class net.corda.core.crypto.Base58 extends java.lang.Object
   public static java.math.BigInteger decodeToBigInteger(String)
   public static String encode(byte[])
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.crypto.CompositeKey extends java.lang.Object implements java.security.PublicKey
+@CordaSerializable
+public final class net.corda.core.crypto.CompositeKey extends java.lang.Object implements java.security.PublicKey
   public final void checkValidity()
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public String getAlgorithm()
-  @org.jetbrains.annotations.NotNull public final List getChildren()
-  @org.jetbrains.annotations.NotNull public byte[] getEncoded()
-  @org.jetbrains.annotations.NotNull public String getFormat()
-  @org.jetbrains.annotations.NotNull public final Set getLeafKeys()
+  @NotNull
+  public String getAlgorithm()
+  @NotNull
+  public final java.util.List<net.corda.core.crypto.CompositeKey$NodeAndWeight> getChildren()
+  @NotNull
+  public byte[] getEncoded()
+  @NotNull
+  public String getFormat()
+  @NotNull
+  public final java.util.Set<java.security.PublicKey> getLeafKeys()
   public final int getThreshold()
   public int hashCode()
-  public final boolean isFulfilledBy(Iterable)
+  public final boolean isFulfilledBy(Iterable<? extends java.security.PublicKey>)
   public final boolean isFulfilledBy(java.security.PublicKey)
-  @org.jetbrains.annotations.NotNull public String toString()
+  @NotNull
+  public String toString()
   public static final net.corda.core.crypto.CompositeKey$Companion Companion
-  @org.jetbrains.annotations.NotNull public static final String KEY_ALGORITHM = "COMPOSITE"
+  @NotNull
+  public static final String KEY_ALGORITHM = "COMPOSITE"
 ##
 public static final class net.corda.core.crypto.CompositeKey$Builder extends java.lang.Object
   public <init>()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.CompositeKey$Builder addKey(java.security.PublicKey, int)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.CompositeKey$Builder addKeys(List)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.CompositeKey$Builder addKeys(java.security.PublicKey...)
-  @org.jetbrains.annotations.NotNull public final java.security.PublicKey build(Integer)
+  @NotNull
+  public final net.corda.core.crypto.CompositeKey$Builder addKey(java.security.PublicKey, int)
+  @NotNull
+  public final net.corda.core.crypto.CompositeKey$Builder addKeys(java.util.List<? extends java.security.PublicKey>)
+  @NotNull
+  public final net.corda.core.crypto.CompositeKey$Builder addKeys(java.security.PublicKey...)
+  @NotNull
+  public final java.security.PublicKey build(Integer)
 ##
 public static final class net.corda.core.crypto.CompositeKey$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final java.security.PublicKey getInstance(org.bouncycastle.asn1.ASN1Primitive)
-  @org.jetbrains.annotations.NotNull public final java.security.PublicKey getInstance(byte[])
+  @NotNull
+  public final java.security.PublicKey getInstance(org.bouncycastle.asn1.ASN1Primitive)
+  @NotNull
+  public final java.security.PublicKey getInstance(byte[])
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.crypto.CompositeKey$NodeAndWeight extends org.bouncycastle.asn1.ASN1Object implements java.lang.Comparable
+@CordaSerializable
+public static final class net.corda.core.crypto.CompositeKey$NodeAndWeight extends org.bouncycastle.asn1.ASN1Object implements java.lang.Comparable
   public <init>(java.security.PublicKey, int)
   public int compareTo(net.corda.core.crypto.CompositeKey$NodeAndWeight)
-  @org.jetbrains.annotations.NotNull public final java.security.PublicKey component1()
+  @NotNull
+  public final java.security.PublicKey component1()
   public final int component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.CompositeKey$NodeAndWeight copy(java.security.PublicKey, int)
+  @NotNull
+  public final net.corda.core.crypto.CompositeKey$NodeAndWeight copy(java.security.PublicKey, int)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final java.security.PublicKey getNode()
+  @NotNull
+  public final java.security.PublicKey getNode()
   public final int getWeight()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()
-  @org.jetbrains.annotations.NotNull public String toString()
+  @NotNull
+  public org.bouncycastle.asn1.ASN1Primitive toASN1Primitive()
+  @NotNull
+  public String toString()
 ##
 public final class net.corda.core.crypto.CompositeKeyFactory extends java.security.KeyFactorySpi
   public <init>()
-  @org.jetbrains.annotations.NotNull protected java.security.PrivateKey engineGeneratePrivate(java.security.spec.KeySpec)
-  @org.jetbrains.annotations.Nullable protected java.security.PublicKey engineGeneratePublic(java.security.spec.KeySpec)
-  @org.jetbrains.annotations.NotNull protected java.security.spec.KeySpec engineGetKeySpec(java.security.Key, Class)
-  @org.jetbrains.annotations.NotNull protected java.security.Key engineTranslateKey(java.security.Key)
+  @NotNull
+  protected java.security.PrivateKey engineGeneratePrivate(java.security.spec.KeySpec)
+  @Nullable
+  protected java.security.PublicKey engineGeneratePublic(java.security.spec.KeySpec)
+  @NotNull
+  protected T engineGetKeySpec(java.security.Key, Class<T>)
+  @NotNull
+  protected java.security.Key engineTranslateKey(java.security.Key)
 ##
 public final class net.corda.core.crypto.CompositeSignature extends java.security.Signature
   public <init>()
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull protected Object engineGetParameter(String)
+  @NotNull
+  protected Object engineGetParameter(String)
   protected void engineInitSign(java.security.PrivateKey)
   protected void engineInitVerify(java.security.PublicKey)
-  @kotlin.Deprecated protected void engineSetParameter(String, Object)
+  protected void engineSetParameter(String, Object)
   protected void engineSetParameter(java.security.spec.AlgorithmParameterSpec)
-  @org.jetbrains.annotations.NotNull protected byte[] engineSign()
+  @NotNull
+  protected byte[] engineSign()
   protected void engineUpdate(byte)
   protected void engineUpdate(byte[], int, int)
   protected boolean engineVerify(byte[])
-  @org.jetbrains.annotations.NotNull public static final java.security.Provider$Service getService(java.security.Provider)
+  @NotNull
+  public static final java.security.Provider$Service getService(java.security.Provider)
   public static final net.corda.core.crypto.CompositeSignature$Companion Companion
-  @org.jetbrains.annotations.NotNull public static final String SIGNATURE_ALGORITHM = "COMPOSITESIG"
+  @NotNull
+  public static final String SIGNATURE_ALGORITHM = "COMPOSITESIG"
 ##
 public static final class net.corda.core.crypto.CompositeSignature$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final java.security.Provider$Service getService(java.security.Provider)
+  @NotNull
+  public final java.security.Provider$Service getService(java.security.Provider)
 ##
 public static final class net.corda.core.crypto.CompositeSignature$State extends java.lang.Object
   public <init>(java.io.ByteArrayOutputStream, net.corda.core.crypto.CompositeKey)
-  @org.jetbrains.annotations.NotNull public final java.io.ByteArrayOutputStream component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.CompositeKey component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.CompositeSignature$State copy(java.io.ByteArrayOutputStream, net.corda.core.crypto.CompositeKey)
+  @NotNull
+  public final java.io.ByteArrayOutputStream component1()
+  @NotNull
+  public final net.corda.core.crypto.CompositeKey component2()
+  @NotNull
+  public final net.corda.core.crypto.CompositeSignature$State copy(java.io.ByteArrayOutputStream, net.corda.core.crypto.CompositeKey)
   public final boolean engineVerify(byte[])
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final java.io.ByteArrayOutputStream getBuffer()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.CompositeKey getVerifyKey()
+  @NotNull
+  public final java.io.ByteArrayOutputStream getBuffer()
+  @NotNull
+  public final net.corda.core.crypto.CompositeKey getVerifyKey()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.crypto.CompositeSignaturesWithKeys extends java.lang.Object
-  public <init>(List)
-  @org.jetbrains.annotations.NotNull public final List component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.CompositeSignaturesWithKeys copy(List)
+@CordaSerializable
+public final class net.corda.core.crypto.CompositeSignaturesWithKeys extends java.lang.Object
+  public <init>(java.util.List<net.corda.core.crypto.TransactionSignature>)
+  @NotNull
+  public final java.util.List<net.corda.core.crypto.TransactionSignature> component1()
+  @NotNull
+  public final net.corda.core.crypto.CompositeSignaturesWithKeys copy(java.util.List<net.corda.core.crypto.TransactionSignature>)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final List getSigs()
+  @NotNull
+  public final java.util.List<net.corda.core.crypto.TransactionSignature> getSigs()
   public int hashCode()
   public String toString()
   public static final net.corda.core.crypto.CompositeSignaturesWithKeys$Companion Companion
 ##
 public static final class net.corda.core.crypto.CompositeSignaturesWithKeys$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.CompositeSignaturesWithKeys getEMPTY()
+  @NotNull
+  public final net.corda.core.crypto.CompositeSignaturesWithKeys getEMPTY()
 ##
 public final class net.corda.core.crypto.CordaObjectIdentifier extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public static final org.bouncycastle.asn1.ASN1ObjectIdentifier COMPOSITE_KEY
-  @org.jetbrains.annotations.NotNull public static final org.bouncycastle.asn1.ASN1ObjectIdentifier COMPOSITE_SIGNATURE
+  @NotNull
+  public static final org.bouncycastle.asn1.ASN1ObjectIdentifier COMPOSITE_KEY
+  @NotNull
+  public static final org.bouncycastle.asn1.ASN1ObjectIdentifier COMPOSITE_SIGNATURE
   public static final net.corda.core.crypto.CordaObjectIdentifier INSTANCE
 ##
 public final class net.corda.core.crypto.CordaSecurityProvider extends java.security.Provider
   public <init>()
   public static final net.corda.core.crypto.CordaSecurityProvider$Companion Companion
-  @org.jetbrains.annotations.NotNull public static final String PROVIDER_NAME = "Corda"
+  @NotNull
+  public static final String PROVIDER_NAME = "Corda"
 ##
 public static final class net.corda.core.crypto.CordaSecurityProvider$Companion extends java.lang.Object
 ##
 public final class net.corda.core.crypto.Crypto extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public static final java.security.PrivateKey decodePrivateKey(String, byte[])
-  @org.jetbrains.annotations.NotNull public static final java.security.PrivateKey decodePrivateKey(net.corda.core.crypto.SignatureScheme, byte[])
-  @org.jetbrains.annotations.NotNull public static final java.security.PrivateKey decodePrivateKey(byte[])
-  @org.jetbrains.annotations.NotNull public static final java.security.PublicKey decodePublicKey(String, byte[])
-  @org.jetbrains.annotations.NotNull public static final java.security.PublicKey decodePublicKey(net.corda.core.crypto.SignatureScheme, byte[])
-  @org.jetbrains.annotations.NotNull public static final java.security.PublicKey decodePublicKey(byte[])
-  @org.jetbrains.annotations.NotNull public static final java.security.KeyPair deriveKeyPair(java.security.PrivateKey, byte[])
-  @org.jetbrains.annotations.NotNull public static final java.security.KeyPair deriveKeyPair(net.corda.core.crypto.SignatureScheme, java.security.PrivateKey, byte[])
-  @org.jetbrains.annotations.NotNull public static final java.security.KeyPair deriveKeyPairFromEntropy(java.math.BigInteger)
-  @org.jetbrains.annotations.NotNull public static final java.security.KeyPair deriveKeyPairFromEntropy(net.corda.core.crypto.SignatureScheme, java.math.BigInteger)
-  @org.jetbrains.annotations.NotNull public static final byte[] doSign(String, java.security.PrivateKey, byte[])
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.crypto.TransactionSignature doSign(java.security.KeyPair, net.corda.core.crypto.SignableData)
-  @org.jetbrains.annotations.NotNull public static final byte[] doSign(java.security.PrivateKey, byte[])
-  @org.jetbrains.annotations.NotNull public static final byte[] doSign(net.corda.core.crypto.SignatureScheme, java.security.PrivateKey, byte[])
+  @NotNull
+  public static final java.security.PrivateKey decodePrivateKey(String, byte[])
+  @NotNull
+  public static final java.security.PrivateKey decodePrivateKey(net.corda.core.crypto.SignatureScheme, byte[])
+  @NotNull
+  public static final java.security.PrivateKey decodePrivateKey(byte[])
+  @NotNull
+  public static final java.security.PublicKey decodePublicKey(String, byte[])
+  @NotNull
+  public static final java.security.PublicKey decodePublicKey(net.corda.core.crypto.SignatureScheme, byte[])
+  @NotNull
+  public static final java.security.PublicKey decodePublicKey(byte[])
+  @NotNull
+  public static final java.security.KeyPair deriveKeyPair(java.security.PrivateKey, byte[])
+  @NotNull
+  public static final java.security.KeyPair deriveKeyPair(net.corda.core.crypto.SignatureScheme, java.security.PrivateKey, byte[])
+  @NotNull
+  public static final java.security.KeyPair deriveKeyPairFromEntropy(java.math.BigInteger)
+  @NotNull
+  public static final java.security.KeyPair deriveKeyPairFromEntropy(net.corda.core.crypto.SignatureScheme, java.math.BigInteger)
+  @NotNull
+  public static final byte[] doSign(String, java.security.PrivateKey, byte[])
+  @NotNull
+  public static final net.corda.core.crypto.TransactionSignature doSign(java.security.KeyPair, net.corda.core.crypto.SignableData)
+  @NotNull
+  public static final byte[] doSign(java.security.PrivateKey, byte[])
+  @NotNull
+  public static final byte[] doSign(net.corda.core.crypto.SignatureScheme, java.security.PrivateKey, byte[])
   public static final boolean doVerify(String, java.security.PublicKey, byte[], byte[])
   public static final boolean doVerify(java.security.PublicKey, byte[], byte[])
   public static final boolean doVerify(net.corda.core.crypto.SecureHash, net.corda.core.crypto.TransactionSignature)
   public static final boolean doVerify(net.corda.core.crypto.SignatureScheme, java.security.PublicKey, byte[], byte[])
-  @org.jetbrains.annotations.NotNull public static final java.security.Provider findProvider(String)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.crypto.SignatureScheme findSignatureScheme(String)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.crypto.SignatureScheme findSignatureScheme(java.security.PrivateKey)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.crypto.SignatureScheme findSignatureScheme(java.security.PublicKey)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.crypto.SignatureScheme findSignatureScheme(org.bouncycastle.asn1.x509.AlgorithmIdentifier)
-  @org.jetbrains.annotations.NotNull public static final java.security.KeyPair generateKeyPair()
-  @org.jetbrains.annotations.NotNull public static final java.security.KeyPair generateKeyPair(String)
-  @org.jetbrains.annotations.NotNull public static final java.security.KeyPair generateKeyPair(net.corda.core.crypto.SignatureScheme)
+  @NotNull
+  public static final java.security.Provider findProvider(String)
+  @NotNull
+  public static final net.corda.core.crypto.SignatureScheme findSignatureScheme(String)
+  @NotNull
+  public static final net.corda.core.crypto.SignatureScheme findSignatureScheme(java.security.PrivateKey)
+  @NotNull
+  public static final net.corda.core.crypto.SignatureScheme findSignatureScheme(java.security.PublicKey)
+  @NotNull
+  public static final net.corda.core.crypto.SignatureScheme findSignatureScheme(org.bouncycastle.asn1.x509.AlgorithmIdentifier)
+  @NotNull
+  public static final java.security.KeyPair generateKeyPair()
+  @NotNull
+  public static final java.security.KeyPair generateKeyPair(String)
+  @NotNull
+  public static final java.security.KeyPair generateKeyPair(net.corda.core.crypto.SignatureScheme)
   public static final boolean isSupportedSignatureScheme(net.corda.core.crypto.SignatureScheme)
   public static final boolean isValid(java.security.PublicKey, byte[], byte[])
   public static final boolean isValid(net.corda.core.crypto.SecureHash, net.corda.core.crypto.TransactionSignature)
   public static final boolean isValid(net.corda.core.crypto.SignatureScheme, java.security.PublicKey, byte[], byte[])
   public static final boolean publicKeyOnCurve(net.corda.core.crypto.SignatureScheme, java.security.PublicKey)
-  @org.jetbrains.annotations.NotNull public static final List supportedSignatureSchemes()
-  @org.jetbrains.annotations.NotNull public static final java.security.PrivateKey toSupportedPrivateKey(java.security.PrivateKey)
-  @org.jetbrains.annotations.NotNull public static final java.security.PublicKey toSupportedPublicKey(java.security.PublicKey)
-  @org.jetbrains.annotations.NotNull public static final java.security.PublicKey toSupportedPublicKey(org.bouncycastle.asn1.x509.SubjectPublicKeyInfo)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.crypto.SignatureScheme COMPOSITE_KEY
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.crypto.SignatureScheme DEFAULT_SIGNATURE_SCHEME
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.crypto.SignatureScheme ECDSA_SECP256K1_SHA256
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.crypto.SignatureScheme ECDSA_SECP256R1_SHA256
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.crypto.SignatureScheme EDDSA_ED25519_SHA512
+  @NotNull
+  public static final java.util.List<net.corda.core.crypto.SignatureScheme> supportedSignatureSchemes()
+  @NotNull
+  public static final java.security.PrivateKey toSupportedPrivateKey(java.security.PrivateKey)
+  @NotNull
+  public static final java.security.PublicKey toSupportedPublicKey(java.security.PublicKey)
+  @NotNull
+  public static final java.security.PublicKey toSupportedPublicKey(org.bouncycastle.asn1.x509.SubjectPublicKeyInfo)
+  @NotNull
+  public static final net.corda.core.crypto.SignatureScheme COMPOSITE_KEY
+  @NotNull
+  public static final net.corda.core.crypto.SignatureScheme DEFAULT_SIGNATURE_SCHEME
+  @NotNull
+  public static final net.corda.core.crypto.SignatureScheme ECDSA_SECP256K1_SHA256
+  @NotNull
+  public static final net.corda.core.crypto.SignatureScheme ECDSA_SECP256R1_SHA256
+  @NotNull
+  public static final net.corda.core.crypto.SignatureScheme EDDSA_ED25519_SHA512
   public static final net.corda.core.crypto.Crypto INSTANCE
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.crypto.SignatureScheme RSA_SHA256
-  @org.jetbrains.annotations.NotNull public static final org.bouncycastle.asn1.DLSequence SHA512_256
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.crypto.SignatureScheme SPHINCS256_SHA256
+  @NotNull
+  public static final net.corda.core.crypto.SignatureScheme RSA_SHA256
+  @NotNull
+  public static final org.bouncycastle.asn1.DLSequence SHA512_256
+  @NotNull
+  public static final net.corda.core.crypto.SignatureScheme SPHINCS256_SHA256
 ##
 public final class net.corda.core.crypto.CryptoUtils extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public static final Set byKeys(Iterable)
-  @org.jetbrains.annotations.NotNull public static final java.security.PrivateKey component1(java.security.KeyPair)
-  @org.jetbrains.annotations.NotNull public static final java.security.PublicKey component2(java.security.KeyPair)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.crypto.SecureHash componentHash(net.corda.core.crypto.SecureHash, net.corda.core.utilities.OpaqueBytes)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.crypto.SecureHash componentHash(net.corda.core.utilities.OpaqueBytes, net.corda.core.contracts.PrivacySalt, int, int)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.crypto.SecureHash$SHA256 computeNonce(net.corda.core.contracts.PrivacySalt, int, int)
-  public static final boolean containsAny(java.security.PublicKey, Iterable)
-  @org.jetbrains.annotations.NotNull public static final java.security.KeyPair entropyToKeyPair(java.math.BigInteger)
-  @org.jetbrains.annotations.NotNull public static final java.security.KeyPair generateKeyPair()
-  @org.jetbrains.annotations.NotNull public static final Set getKeys(java.security.PublicKey)
-  public static final boolean isFulfilledBy(java.security.PublicKey, Iterable)
+  @NotNull
+  public static final java.util.Set<java.security.PublicKey> byKeys(Iterable<net.corda.core.crypto.TransactionSignature>)
+  @NotNull
+  public static final java.security.PrivateKey component1(java.security.KeyPair)
+  @NotNull
+  public static final java.security.PublicKey component2(java.security.KeyPair)
+  @NotNull
+  public static final net.corda.core.crypto.SecureHash componentHash(net.corda.core.crypto.SecureHash, net.corda.core.utilities.OpaqueBytes)
+  @NotNull
+  public static final net.corda.core.crypto.SecureHash componentHash(net.corda.core.utilities.OpaqueBytes, net.corda.core.contracts.PrivacySalt, int, int)
+  @NotNull
+  public static final net.corda.core.crypto.SecureHash$SHA256 computeNonce(net.corda.core.contracts.PrivacySalt, int, int)
+  public static final boolean containsAny(java.security.PublicKey, Iterable<? extends java.security.PublicKey>)
+  @NotNull
+  public static final java.security.KeyPair entropyToKeyPair(java.math.BigInteger)
+  @NotNull
+  public static final java.security.KeyPair generateKeyPair()
+  @NotNull
+  public static final java.util.Set<java.security.PublicKey> getKeys(java.security.PublicKey)
+  public static final boolean isFulfilledBy(java.security.PublicKey, Iterable<? extends java.security.PublicKey>)
   public static final boolean isFulfilledBy(java.security.PublicKey, java.security.PublicKey)
   public static final boolean isValid(java.security.PublicKey, byte[], net.corda.core.crypto.DigitalSignature)
-  @org.jetbrains.annotations.NotNull public static final java.security.SecureRandom newSecureRandom()
+  @NotNull
+  public static final java.security.SecureRandom newSecureRandom()
   public static final long random63BitValue()
-  @org.jetbrains.annotations.NotNull public static final byte[] secureRandomBytes(int)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.crypto.SecureHash serializedHash(Object)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.crypto.TransactionSignature sign(java.security.KeyPair, net.corda.core.crypto.SignableData)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.crypto.DigitalSignature$WithKey sign(java.security.KeyPair, net.corda.core.utilities.OpaqueBytes)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.crypto.DigitalSignature$WithKey sign(java.security.KeyPair, byte[])
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.crypto.DigitalSignature sign(java.security.PrivateKey, byte[])
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.crypto.DigitalSignature$WithKey sign(java.security.PrivateKey, byte[], java.security.PublicKey)
-  @org.jetbrains.annotations.NotNull public static final String toStringShort(java.security.PublicKey)
+  @NotNull
+  public static final byte[] secureRandomBytes(int)
+  @NotNull
+  public static final net.corda.core.crypto.SecureHash serializedHash(T)
+  @NotNull
+  public static final net.corda.core.crypto.TransactionSignature sign(java.security.KeyPair, net.corda.core.crypto.SignableData)
+  @NotNull
+  public static final net.corda.core.crypto.DigitalSignature$WithKey sign(java.security.KeyPair, net.corda.core.utilities.OpaqueBytes)
+  @NotNull
+  public static final net.corda.core.crypto.DigitalSignature$WithKey sign(java.security.KeyPair, byte[])
+  @NotNull
+  public static final net.corda.core.crypto.DigitalSignature sign(java.security.PrivateKey, byte[])
+  @NotNull
+  public static final net.corda.core.crypto.DigitalSignature$WithKey sign(java.security.PrivateKey, byte[], java.security.PublicKey)
+  @NotNull
+  public static final String toStringShort(java.security.PublicKey)
   public static final boolean verify(java.security.KeyPair, byte[], byte[])
   public static final boolean verify(java.security.PublicKey, byte[], net.corda.core.crypto.DigitalSignature)
   public static final boolean verify(java.security.PublicKey, byte[], byte[])
 ##
-@net.corda.core.serialization.CordaSerializable public class net.corda.core.crypto.DigitalSignature extends net.corda.core.utilities.OpaqueBytes
+@CordaSerializable
+public class net.corda.core.crypto.DigitalSignature extends net.corda.core.utilities.OpaqueBytes
   public <init>(byte[])
 ##
-@net.corda.core.serialization.CordaSerializable public static class net.corda.core.crypto.DigitalSignature$WithKey extends net.corda.core.crypto.DigitalSignature
+@CordaSerializable
+public static class net.corda.core.crypto.DigitalSignature$WithKey extends net.corda.core.crypto.DigitalSignature
   public <init>(java.security.PublicKey, byte[])
-  @org.jetbrains.annotations.NotNull public final java.security.PublicKey getBy()
+  @NotNull
+  public final java.security.PublicKey getBy()
   public final boolean isValid(byte[])
   public final boolean verify(net.corda.core.utilities.OpaqueBytes)
   public final boolean verify(byte[])
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.DigitalSignature withoutKey()
+  @NotNull
+  public final net.corda.core.crypto.DigitalSignature withoutKey()
 ##
 public final class net.corda.core.crypto.DummySecureRandom extends java.security.SecureRandom
   public static final net.corda.core.crypto.DummySecureRandom INSTANCE
 ##
 public abstract class net.corda.core.crypto.MerkleTree extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.crypto.SecureHash getHash()
+  @NotNull
+  public abstract net.corda.core.crypto.SecureHash getHash()
   public static final net.corda.core.crypto.MerkleTree$Companion Companion
 ##
 public static final class net.corda.core.crypto.MerkleTree$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.MerkleTree getMerkleTree(List)
+  @NotNull
+  public final net.corda.core.crypto.MerkleTree getMerkleTree(java.util.List<? extends net.corda.core.crypto.SecureHash>)
 ##
 public static final class net.corda.core.crypto.MerkleTree$Leaf extends net.corda.core.crypto.MerkleTree
   public <init>(net.corda.core.crypto.SecureHash)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.MerkleTree$Leaf copy(net.corda.core.crypto.SecureHash)
+  @NotNull
+  public final net.corda.core.crypto.SecureHash component1()
+  @NotNull
+  public final net.corda.core.crypto.MerkleTree$Leaf copy(net.corda.core.crypto.SecureHash)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public net.corda.core.crypto.SecureHash getHash()
+  @NotNull
+  public net.corda.core.crypto.SecureHash getHash()
   public int hashCode()
   public String toString()
 ##
 public static final class net.corda.core.crypto.MerkleTree$Node extends net.corda.core.crypto.MerkleTree
   public <init>(net.corda.core.crypto.SecureHash, net.corda.core.crypto.MerkleTree, net.corda.core.crypto.MerkleTree)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.MerkleTree component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.MerkleTree component3()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.MerkleTree$Node copy(net.corda.core.crypto.SecureHash, net.corda.core.crypto.MerkleTree, net.corda.core.crypto.MerkleTree)
+  @NotNull
+  public final net.corda.core.crypto.SecureHash component1()
+  @NotNull
+  public final net.corda.core.crypto.MerkleTree component2()
+  @NotNull
+  public final net.corda.core.crypto.MerkleTree component3()
+  @NotNull
+  public final net.corda.core.crypto.MerkleTree$Node copy(net.corda.core.crypto.SecureHash, net.corda.core.crypto.MerkleTree, net.corda.core.crypto.MerkleTree)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public net.corda.core.crypto.SecureHash getHash()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.MerkleTree getLeft()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.MerkleTree getRight()
+  @NotNull
+  public net.corda.core.crypto.SecureHash getHash()
+  @NotNull
+  public final net.corda.core.crypto.MerkleTree getLeft()
+  @NotNull
+  public final net.corda.core.crypto.MerkleTree getRight()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.crypto.MerkleTreeException extends net.corda.core.CordaException
+@CordaSerializable
+public final class net.corda.core.crypto.MerkleTreeException extends net.corda.core.CordaException
   public <init>(String)
-  @org.jetbrains.annotations.NotNull public final String getReason()
+  @NotNull
+  public final String getReason()
 ##
 public final class net.corda.core.crypto.NullKeys extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.AnonymousParty getNULL_PARTY()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.TransactionSignature getNULL_SIGNATURE()
+  @NotNull
+  public final net.corda.core.identity.AnonymousParty getNULL_PARTY()
+  @NotNull
+  public final net.corda.core.crypto.TransactionSignature getNULL_SIGNATURE()
   public static final net.corda.core.crypto.NullKeys INSTANCE
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.crypto.NullKeys$NullPublicKey extends java.lang.Object implements java.security.PublicKey, java.lang.Comparable
+@CordaSerializable
+public static final class net.corda.core.crypto.NullKeys$NullPublicKey extends java.lang.Object implements java.security.PublicKey, java.lang.Comparable
   public int compareTo(java.security.PublicKey)
-  @org.jetbrains.annotations.NotNull public String getAlgorithm()
-  @org.jetbrains.annotations.NotNull public byte[] getEncoded()
-  @org.jetbrains.annotations.NotNull public String getFormat()
-  @org.jetbrains.annotations.NotNull public String toString()
+  @NotNull
+  public String getAlgorithm()
+  @NotNull
+  public byte[] getEncoded()
+  @NotNull
+  public String getFormat()
+  @NotNull
+  public String toString()
   public static final net.corda.core.crypto.NullKeys$NullPublicKey INSTANCE
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.crypto.PartialMerkleTree extends java.lang.Object
+@CordaSerializable
+public final class net.corda.core.crypto.PartialMerkleTree extends java.lang.Object
   public <init>(net.corda.core.crypto.PartialMerkleTree$PartialTree)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.PartialMerkleTree$PartialTree getRoot()
-  public final boolean verify(net.corda.core.crypto.SecureHash, List)
+  @NotNull
+  public final net.corda.core.crypto.PartialMerkleTree$PartialTree getRoot()
+  public final boolean verify(net.corda.core.crypto.SecureHash, java.util.List<? extends net.corda.core.crypto.SecureHash>)
   public static final net.corda.core.crypto.PartialMerkleTree$Companion Companion
 ##
 public static final class net.corda.core.crypto.PartialMerkleTree$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.PartialMerkleTree build(net.corda.core.crypto.MerkleTree, List)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash rootAndUsedHashes(net.corda.core.crypto.PartialMerkleTree$PartialTree, List)
+  @NotNull
+  public final net.corda.core.crypto.PartialMerkleTree build(net.corda.core.crypto.MerkleTree, java.util.List<? extends net.corda.core.crypto.SecureHash>)
+  @NotNull
+  public final net.corda.core.crypto.SecureHash rootAndUsedHashes(net.corda.core.crypto.PartialMerkleTree$PartialTree, java.util.List<net.corda.core.crypto.SecureHash>)
 ##
-@net.corda.core.serialization.CordaSerializable public abstract static class net.corda.core.crypto.PartialMerkleTree$PartialTree extends java.lang.Object
+@CordaSerializable
+public abstract static class net.corda.core.crypto.PartialMerkleTree$PartialTree extends java.lang.Object
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.crypto.PartialMerkleTree$PartialTree$IncludedLeaf extends net.corda.core.crypto.PartialMerkleTree$PartialTree
+@CordaSerializable
+public static final class net.corda.core.crypto.PartialMerkleTree$PartialTree$IncludedLeaf extends net.corda.core.crypto.PartialMerkleTree$PartialTree
   public <init>(net.corda.core.crypto.SecureHash)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.PartialMerkleTree$PartialTree$IncludedLeaf copy(net.corda.core.crypto.SecureHash)
+  @NotNull
+  public final net.corda.core.crypto.SecureHash component1()
+  @NotNull
+  public final net.corda.core.crypto.PartialMerkleTree$PartialTree$IncludedLeaf copy(net.corda.core.crypto.SecureHash)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash getHash()
+  @NotNull
+  public final net.corda.core.crypto.SecureHash getHash()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.crypto.PartialMerkleTree$PartialTree$Leaf extends net.corda.core.crypto.PartialMerkleTree$PartialTree
+@CordaSerializable
+public static final class net.corda.core.crypto.PartialMerkleTree$PartialTree$Leaf extends net.corda.core.crypto.PartialMerkleTree$PartialTree
   public <init>(net.corda.core.crypto.SecureHash)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.PartialMerkleTree$PartialTree$Leaf copy(net.corda.core.crypto.SecureHash)
+  @NotNull
+  public final net.corda.core.crypto.SecureHash component1()
+  @NotNull
+  public final net.corda.core.crypto.PartialMerkleTree$PartialTree$Leaf copy(net.corda.core.crypto.SecureHash)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash getHash()
+  @NotNull
+  public final net.corda.core.crypto.SecureHash getHash()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.crypto.PartialMerkleTree$PartialTree$Node extends net.corda.core.crypto.PartialMerkleTree$PartialTree
+@CordaSerializable
+public static final class net.corda.core.crypto.PartialMerkleTree$PartialTree$Node extends net.corda.core.crypto.PartialMerkleTree$PartialTree
   public <init>(net.corda.core.crypto.PartialMerkleTree$PartialTree, net.corda.core.crypto.PartialMerkleTree$PartialTree)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.PartialMerkleTree$PartialTree component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.PartialMerkleTree$PartialTree component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.PartialMerkleTree$PartialTree$Node copy(net.corda.core.crypto.PartialMerkleTree$PartialTree, net.corda.core.crypto.PartialMerkleTree$PartialTree)
+  @NotNull
+  public final net.corda.core.crypto.PartialMerkleTree$PartialTree component1()
+  @NotNull
+  public final net.corda.core.crypto.PartialMerkleTree$PartialTree component2()
+  @NotNull
+  public final net.corda.core.crypto.PartialMerkleTree$PartialTree$Node copy(net.corda.core.crypto.PartialMerkleTree$PartialTree, net.corda.core.crypto.PartialMerkleTree$PartialTree)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.PartialMerkleTree$PartialTree getLeft()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.PartialMerkleTree$PartialTree getRight()
+  @NotNull
+  public final net.corda.core.crypto.PartialMerkleTree$PartialTree getLeft()
+  @NotNull
+  public final net.corda.core.crypto.PartialMerkleTree$PartialTree getRight()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public abstract class net.corda.core.crypto.SecureHash extends net.corda.core.utilities.OpaqueBytes
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash$SHA256 hashConcat(net.corda.core.crypto.SecureHash)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.crypto.SecureHash$SHA256 parse(String)
-  @org.jetbrains.annotations.NotNull public final String prefixChars(int)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.crypto.SecureHash$SHA256 randomSHA256()
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.crypto.SecureHash$SHA256 sha256(String)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.crypto.SecureHash$SHA256 sha256(byte[])
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.crypto.SecureHash$SHA256 sha256Twice(byte[])
-  @org.jetbrains.annotations.NotNull public String toString()
+@CordaSerializable
+public abstract class net.corda.core.crypto.SecureHash extends net.corda.core.utilities.OpaqueBytes
+  @NotNull
+  public final net.corda.core.crypto.SecureHash$SHA256 hashConcat(net.corda.core.crypto.SecureHash)
+  @NotNull
+  public static final net.corda.core.crypto.SecureHash$SHA256 parse(String)
+  @NotNull
+  public final String prefixChars(int)
+  @NotNull
+  public static final net.corda.core.crypto.SecureHash$SHA256 randomSHA256()
+  @NotNull
+  public static final net.corda.core.crypto.SecureHash$SHA256 sha256(String)
+  @NotNull
+  public static final net.corda.core.crypto.SecureHash$SHA256 sha256(byte[])
+  @NotNull
+  public static final net.corda.core.crypto.SecureHash$SHA256 sha256Twice(byte[])
+  @NotNull
+  public String toString()
   public static final net.corda.core.crypto.SecureHash$Companion Companion
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.crypto.SecureHash$SHA256 allOnesHash
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.crypto.SecureHash$SHA256 zeroHash
 ##
 public static final class net.corda.core.crypto.SecureHash$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash$SHA256 getAllOnesHash()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash$SHA256 getZeroHash()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash$SHA256 parse(String)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash$SHA256 randomSHA256()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash$SHA256 sha256(String)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash$SHA256 sha256(byte[])
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash$SHA256 sha256Twice(byte[])
+  @NotNull
+  public final net.corda.core.crypto.SecureHash$SHA256 getAllOnesHash()
+  @NotNull
+  public final net.corda.core.crypto.SecureHash$SHA256 getZeroHash()
+  @NotNull
+  public final net.corda.core.crypto.SecureHash$SHA256 parse(String)
+  @NotNull
+  public final net.corda.core.crypto.SecureHash$SHA256 randomSHA256()
+  @NotNull
+  public final net.corda.core.crypto.SecureHash$SHA256 sha256(String)
+  @NotNull
+  public final net.corda.core.crypto.SecureHash$SHA256 sha256(byte[])
+  @NotNull
+  public final net.corda.core.crypto.SecureHash$SHA256 sha256Twice(byte[])
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.crypto.SecureHash$SHA256 extends net.corda.core.crypto.SecureHash
+@CordaSerializable
+public static final class net.corda.core.crypto.SecureHash$SHA256 extends net.corda.core.crypto.SecureHash
   public <init>(byte[])
 ##
 public final class net.corda.core.crypto.SecureHashKt extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.crypto.SecureHash$SHA256 sha256(net.corda.core.utilities.OpaqueBytes)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.crypto.SecureHash$SHA256 sha256(byte[])
+  @NotNull
+  public static final net.corda.core.crypto.SecureHash$SHA256 sha256(net.corda.core.utilities.OpaqueBytes)
+  @NotNull
+  public static final net.corda.core.crypto.SecureHash$SHA256 sha256(byte[])
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.crypto.SignableData extends java.lang.Object
+@CordaSerializable
+public final class net.corda.core.crypto.SignableData extends java.lang.Object
   public <init>(net.corda.core.crypto.SecureHash, net.corda.core.crypto.SignatureMetadata)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SignatureMetadata component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SignableData copy(net.corda.core.crypto.SecureHash, net.corda.core.crypto.SignatureMetadata)
+  @NotNull
+  public final net.corda.core.crypto.SecureHash component1()
+  @NotNull
+  public final net.corda.core.crypto.SignatureMetadata component2()
+  @NotNull
+  public final net.corda.core.crypto.SignableData copy(net.corda.core.crypto.SecureHash, net.corda.core.crypto.SignatureMetadata)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SignatureMetadata getSignatureMetadata()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash getTxId()
+  @NotNull
+  public final net.corda.core.crypto.SignatureMetadata getSignatureMetadata()
+  @NotNull
+  public final net.corda.core.crypto.SecureHash getTxId()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.crypto.SignatureMetadata extends java.lang.Object
+@CordaSerializable
+public final class net.corda.core.crypto.SignatureMetadata extends java.lang.Object
   public <init>(int, int)
   public final int component1()
   public final int component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SignatureMetadata copy(int, int)
+  @NotNull
+  public final net.corda.core.crypto.SignatureMetadata copy(int, int)
   public boolean equals(Object)
   public final int getPlatformVersion()
   public final int getSchemeNumberID()
@@ -1023,46 +1531,73 @@ public final class net.corda.core.crypto.SecureHashKt extends java.lang.Object
   public String toString()
 ##
 public final class net.corda.core.crypto.SignatureScheme extends java.lang.Object
-  public <init>(int, String, org.bouncycastle.asn1.x509.AlgorithmIdentifier, List, String, String, String, java.security.spec.AlgorithmParameterSpec, Integer, String)
+  public <init>(int, String, org.bouncycastle.asn1.x509.AlgorithmIdentifier, java.util.List<? extends org.bouncycastle.asn1.x509.AlgorithmIdentifier>, String, String, String, java.security.spec.AlgorithmParameterSpec, Integer, String)
   public final int component1()
-  @org.jetbrains.annotations.NotNull public final String component10()
-  @org.jetbrains.annotations.NotNull public final String component2()
-  @org.jetbrains.annotations.NotNull public final org.bouncycastle.asn1.x509.AlgorithmIdentifier component3()
-  @org.jetbrains.annotations.NotNull public final List component4()
-  @org.jetbrains.annotations.NotNull public final String component5()
-  @org.jetbrains.annotations.NotNull public final String component6()
-  @org.jetbrains.annotations.NotNull public final String component7()
-  @org.jetbrains.annotations.Nullable public final java.security.spec.AlgorithmParameterSpec component8()
-  @org.jetbrains.annotations.Nullable public final Integer component9()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SignatureScheme copy(int, String, org.bouncycastle.asn1.x509.AlgorithmIdentifier, List, String, String, String, java.security.spec.AlgorithmParameterSpec, Integer, String)
+  @NotNull
+  public final String component10()
+  @NotNull
+  public final String component2()
+  @NotNull
+  public final org.bouncycastle.asn1.x509.AlgorithmIdentifier component3()
+  @NotNull
+  public final java.util.List<org.bouncycastle.asn1.x509.AlgorithmIdentifier> component4()
+  @NotNull
+  public final String component5()
+  @NotNull
+  public final String component6()
+  @NotNull
+  public final String component7()
+  @Nullable
+  public final java.security.spec.AlgorithmParameterSpec component8()
+  @Nullable
+  public final Integer component9()
+  @NotNull
+  public final net.corda.core.crypto.SignatureScheme copy(int, String, org.bouncycastle.asn1.x509.AlgorithmIdentifier, java.util.List<? extends org.bouncycastle.asn1.x509.AlgorithmIdentifier>, String, String, String, java.security.spec.AlgorithmParameterSpec, Integer, String)
   public boolean equals(Object)
-  @org.jetbrains.annotations.Nullable public final java.security.spec.AlgorithmParameterSpec getAlgSpec()
-  @org.jetbrains.annotations.NotNull public final String getAlgorithmName()
-  @org.jetbrains.annotations.NotNull public final List getAlternativeOIDs()
-  @org.jetbrains.annotations.NotNull public final String getDesc()
-  @org.jetbrains.annotations.Nullable public final Integer getKeySize()
-  @org.jetbrains.annotations.NotNull public final String getProviderName()
-  @org.jetbrains.annotations.NotNull public final String getSchemeCodeName()
+  @Nullable
+  public final java.security.spec.AlgorithmParameterSpec getAlgSpec()
+  @NotNull
+  public final String getAlgorithmName()
+  @NotNull
+  public final java.util.List<org.bouncycastle.asn1.x509.AlgorithmIdentifier> getAlternativeOIDs()
+  @NotNull
+  public final String getDesc()
+  @Nullable
+  public final Integer getKeySize()
+  @NotNull
+  public final String getProviderName()
+  @NotNull
+  public final String getSchemeCodeName()
   public final int getSchemeNumberID()
-  @org.jetbrains.annotations.NotNull public final String getSignatureName()
-  @org.jetbrains.annotations.NotNull public final org.bouncycastle.asn1.x509.AlgorithmIdentifier getSignatureOID()
+  @NotNull
+  public final String getSignatureName()
+  @NotNull
+  public final org.bouncycastle.asn1.x509.AlgorithmIdentifier getSignatureOID()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public class net.corda.core.crypto.SignedData extends java.lang.Object
-  public <init>(net.corda.core.serialization.SerializedBytes, net.corda.core.crypto.DigitalSignature$WithKey)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.serialization.SerializedBytes getRaw()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.DigitalSignature$WithKey getSig()
-  @org.jetbrains.annotations.NotNull public final Object verified()
-  protected void verifyData(Object)
+@CordaSerializable
+public class net.corda.core.crypto.SignedData extends java.lang.Object
+  public <init>(net.corda.core.serialization.SerializedBytes<T>, net.corda.core.crypto.DigitalSignature$WithKey)
+  @NotNull
+  public final net.corda.core.serialization.SerializedBytes<T> getRaw()
+  @NotNull
+  public final net.corda.core.crypto.DigitalSignature$WithKey getSig()
+  @NotNull
+  public final T verified()
+  protected void verifyData(T)
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.crypto.TransactionSignature extends net.corda.core.crypto.DigitalSignature
+@CordaSerializable
+public final class net.corda.core.crypto.TransactionSignature extends net.corda.core.crypto.DigitalSignature
   public <init>(byte[], java.security.PublicKey, net.corda.core.crypto.SignatureMetadata)
   public <init>(byte[], java.security.PublicKey, net.corda.core.crypto.SignatureMetadata, net.corda.core.crypto.PartialMerkleTree)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final java.security.PublicKey getBy()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.crypto.PartialMerkleTree getPartialMerkleTree()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SignatureMetadata getSignatureMetadata()
+  @NotNull
+  public final java.security.PublicKey getBy()
+  @Nullable
+  public final net.corda.core.crypto.PartialMerkleTree getPartialMerkleTree()
+  @NotNull
+  public final net.corda.core.crypto.SignatureMetadata getSignatureMetadata()
   public int hashCode()
   public final boolean isValid(net.corda.core.crypto.SecureHash)
   public final boolean verify(net.corda.core.crypto.SecureHash)
@@ -1073,463 +1608,717 @@ public abstract class net.corda.core.flows.AbstractStateReplacementFlow extends
 public abstract static class net.corda.core.flows.AbstractStateReplacementFlow$Acceptor extends net.corda.core.flows.FlowLogic
   public <init>(net.corda.core.flows.FlowSession)
   public <init>(net.corda.core.flows.FlowSession, net.corda.core.utilities.ProgressTracker)
-  @co.paralleluniverse.fibers.Suspendable @org.jetbrains.annotations.Nullable public Void call()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.FlowSession getInitiatingSession()
-  @org.jetbrains.annotations.NotNull public net.corda.core.utilities.ProgressTracker getProgressTracker()
-  protected abstract void verifyProposal(net.corda.core.transactions.SignedTransaction, net.corda.core.flows.AbstractStateReplacementFlow$Proposal)
+  @Suspendable
+  @Nullable
+  public Void call()
+  @NotNull
+  public final net.corda.core.flows.FlowSession getInitiatingSession()
+  @NotNull
+  public net.corda.core.utilities.ProgressTracker getProgressTracker()
+  protected abstract void verifyProposal(net.corda.core.transactions.SignedTransaction, net.corda.core.flows.AbstractStateReplacementFlow$Proposal<? extends T>)
   public static final net.corda.core.flows.AbstractStateReplacementFlow$Acceptor$Companion Companion
 ##
 public static final class net.corda.core.flows.AbstractStateReplacementFlow$Acceptor$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ProgressTracker tracker()
+  @NotNull
+  public final net.corda.core.utilities.ProgressTracker tracker()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.flows.AbstractStateReplacementFlow$Acceptor$Companion$APPROVING extends net.corda.core.utilities.ProgressTracker$Step
+@CordaSerializable
+public static final class net.corda.core.flows.AbstractStateReplacementFlow$Acceptor$Companion$APPROVING extends net.corda.core.utilities.ProgressTracker$Step
   public static final net.corda.core.flows.AbstractStateReplacementFlow$Acceptor$Companion$APPROVING INSTANCE
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.flows.AbstractStateReplacementFlow$Acceptor$Companion$VERIFYING extends net.corda.core.utilities.ProgressTracker$Step
+@CordaSerializable
+public static final class net.corda.core.flows.AbstractStateReplacementFlow$Acceptor$Companion$VERIFYING extends net.corda.core.utilities.ProgressTracker$Step
   public static final net.corda.core.flows.AbstractStateReplacementFlow$Acceptor$Companion$VERIFYING INSTANCE
 ##
 public abstract static class net.corda.core.flows.AbstractStateReplacementFlow$Instigator extends net.corda.core.flows.FlowLogic
-  public <init>(net.corda.core.contracts.StateAndRef, Object, net.corda.core.utilities.ProgressTracker)
-  @org.jetbrains.annotations.NotNull protected abstract net.corda.core.flows.AbstractStateReplacementFlow$UpgradeTx assembleTx()
-  @co.paralleluniverse.fibers.Suspendable @org.jetbrains.annotations.NotNull public net.corda.core.contracts.StateAndRef call()
-  public final Object getModification()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.StateAndRef getOriginalState()
-  @org.jetbrains.annotations.NotNull public List getParticipantSessions()
-  @org.jetbrains.annotations.NotNull public net.corda.core.utilities.ProgressTracker getProgressTracker()
+  public <init>(net.corda.core.contracts.StateAndRef<? extends S>, M, net.corda.core.utilities.ProgressTracker)
+  @NotNull
+  protected abstract net.corda.core.flows.AbstractStateReplacementFlow$UpgradeTx assembleTx()
+  @Suspendable
+  @NotNull
+  public net.corda.core.contracts.StateAndRef<T> call()
+  public final M getModification()
+  @NotNull
+  public final net.corda.core.contracts.StateAndRef<S> getOriginalState()
+  @NotNull
+  public java.util.List<kotlin.Pair<net.corda.core.flows.FlowSession, java.util.List<net.corda.core.identity.AbstractParty>>> getParticipantSessions()
+  @NotNull
+  public net.corda.core.utilities.ProgressTracker getProgressTracker()
   public static final net.corda.core.flows.AbstractStateReplacementFlow$Instigator$Companion Companion
 ##
 public static final class net.corda.core.flows.AbstractStateReplacementFlow$Instigator$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ProgressTracker tracker()
+  @NotNull
+  public final net.corda.core.utilities.ProgressTracker tracker()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.flows.AbstractStateReplacementFlow$Instigator$Companion$NOTARY extends net.corda.core.utilities.ProgressTracker$Step
+@CordaSerializable
+public static final class net.corda.core.flows.AbstractStateReplacementFlow$Instigator$Companion$NOTARY extends net.corda.core.utilities.ProgressTracker$Step
   public static final net.corda.core.flows.AbstractStateReplacementFlow$Instigator$Companion$NOTARY INSTANCE
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.flows.AbstractStateReplacementFlow$Instigator$Companion$SIGNING extends net.corda.core.utilities.ProgressTracker$Step
+@CordaSerializable
+public static final class net.corda.core.flows.AbstractStateReplacementFlow$Instigator$Companion$SIGNING extends net.corda.core.utilities.ProgressTracker$Step
   public static final net.corda.core.flows.AbstractStateReplacementFlow$Instigator$Companion$SIGNING INSTANCE
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.flows.AbstractStateReplacementFlow$Proposal extends java.lang.Object
-  public <init>(net.corda.core.contracts.StateRef, Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.StateRef component1()
-  public final Object component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.AbstractStateReplacementFlow$Proposal copy(net.corda.core.contracts.StateRef, Object)
+@CordaSerializable
+public static final class net.corda.core.flows.AbstractStateReplacementFlow$Proposal extends java.lang.Object
+  public <init>(net.corda.core.contracts.StateRef, M)
+  @NotNull
+  public final net.corda.core.contracts.StateRef component1()
+  public final M component2()
+  @NotNull
+  public final net.corda.core.flows.AbstractStateReplacementFlow$Proposal<M> copy(net.corda.core.contracts.StateRef, M)
   public boolean equals(Object)
-  public final Object getModification()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.StateRef getStateRef()
+  public final M getModification()
+  @NotNull
+  public final net.corda.core.contracts.StateRef getStateRef()
   public int hashCode()
   public String toString()
 ##
 public static final class net.corda.core.flows.AbstractStateReplacementFlow$UpgradeTx extends java.lang.Object
   public <init>(net.corda.core.transactions.SignedTransaction)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.SignedTransaction component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.AbstractStateReplacementFlow$UpgradeTx copy(net.corda.core.transactions.SignedTransaction)
+  @NotNull
+  public final net.corda.core.transactions.SignedTransaction component1()
+  @NotNull
+  public final net.corda.core.flows.AbstractStateReplacementFlow$UpgradeTx copy(net.corda.core.transactions.SignedTransaction)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.SignedTransaction getStx()
+  @NotNull
+  public final net.corda.core.transactions.SignedTransaction getStx()
   public int hashCode()
   public String toString()
 ##
-@co.paralleluniverse.fibers.Suspendable public final class net.corda.core.flows.CollectSignatureFlow extends net.corda.core.flows.FlowLogic
-  public <init>(net.corda.core.transactions.SignedTransaction, net.corda.core.flows.FlowSession, List)
+@Suspendable
+public final class net.corda.core.flows.CollectSignatureFlow extends net.corda.core.flows.FlowLogic
+  public <init>(net.corda.core.transactions.SignedTransaction, net.corda.core.flows.FlowSession, java.util.List<? extends java.security.PublicKey>)
   public <init>(net.corda.core.transactions.SignedTransaction, net.corda.core.flows.FlowSession, java.security.PublicKey...)
-  @co.paralleluniverse.fibers.Suspendable @org.jetbrains.annotations.NotNull public List call()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.SignedTransaction getPartiallySignedTx()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.FlowSession getSession()
-  @org.jetbrains.annotations.NotNull public final List getSigningKeys()
+  @Suspendable
+  @NotNull
+  public java.util.List<net.corda.core.crypto.TransactionSignature> call()
+  @NotNull
+  public final net.corda.core.transactions.SignedTransaction getPartiallySignedTx()
+  @NotNull
+  public final net.corda.core.flows.FlowSession getSession()
+  @NotNull
+  public final java.util.List<java.security.PublicKey> getSigningKeys()
 ##
 public final class net.corda.core.flows.CollectSignaturesFlow extends net.corda.core.flows.FlowLogic
-  public <init>(net.corda.core.transactions.SignedTransaction, Collection)
-  public <init>(net.corda.core.transactions.SignedTransaction, Collection, Iterable)
-  public <init>(net.corda.core.transactions.SignedTransaction, Collection, Iterable, net.corda.core.utilities.ProgressTracker)
-  public <init>(net.corda.core.transactions.SignedTransaction, Collection, net.corda.core.utilities.ProgressTracker)
-  @co.paralleluniverse.fibers.Suspendable @org.jetbrains.annotations.NotNull public net.corda.core.transactions.SignedTransaction call()
-  @org.jetbrains.annotations.Nullable public final Iterable getMyOptionalKeys()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.SignedTransaction getPartiallySignedTx()
-  @org.jetbrains.annotations.NotNull public net.corda.core.utilities.ProgressTracker getProgressTracker()
-  @org.jetbrains.annotations.NotNull public final Collection getSessionsToCollectFrom()
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.utilities.ProgressTracker tracker()
+  public <init>(net.corda.core.transactions.SignedTransaction, java.util.Collection<? extends net.corda.core.flows.FlowSession>)
+  public <init>(net.corda.core.transactions.SignedTransaction, java.util.Collection<? extends net.corda.core.flows.FlowSession>, Iterable<? extends java.security.PublicKey>)
+  public <init>(net.corda.core.transactions.SignedTransaction, java.util.Collection<? extends net.corda.core.flows.FlowSession>, Iterable<? extends java.security.PublicKey>, net.corda.core.utilities.ProgressTracker)
+  public <init>(net.corda.core.transactions.SignedTransaction, java.util.Collection<? extends net.corda.core.flows.FlowSession>, net.corda.core.utilities.ProgressTracker)
+  @Suspendable
+  @NotNull
+  public net.corda.core.transactions.SignedTransaction call()
+  @Nullable
+  public final Iterable<java.security.PublicKey> getMyOptionalKeys()
+  @NotNull
+  public final net.corda.core.transactions.SignedTransaction getPartiallySignedTx()
+  @NotNull
+  public net.corda.core.utilities.ProgressTracker getProgressTracker()
+  @NotNull
+  public final java.util.Collection<net.corda.core.flows.FlowSession> getSessionsToCollectFrom()
+  @NotNull
+  public static final net.corda.core.utilities.ProgressTracker tracker()
   public static final net.corda.core.flows.CollectSignaturesFlow$Companion Companion
 ##
 public static final class net.corda.core.flows.CollectSignaturesFlow$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ProgressTracker tracker()
+  @NotNull
+  public final net.corda.core.utilities.ProgressTracker tracker()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.flows.CollectSignaturesFlow$Companion$COLLECTING extends net.corda.core.utilities.ProgressTracker$Step
+@CordaSerializable
+public static final class net.corda.core.flows.CollectSignaturesFlow$Companion$COLLECTING extends net.corda.core.utilities.ProgressTracker$Step
   public static final net.corda.core.flows.CollectSignaturesFlow$Companion$COLLECTING INSTANCE
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.flows.CollectSignaturesFlow$Companion$VERIFYING extends net.corda.core.utilities.ProgressTracker$Step
+@CordaSerializable
+public static final class net.corda.core.flows.CollectSignaturesFlow$Companion$VERIFYING extends net.corda.core.utilities.ProgressTracker$Step
   public static final net.corda.core.flows.CollectSignaturesFlow$Companion$VERIFYING INSTANCE
 ##
 public final class net.corda.core.flows.ContractUpgradeFlow extends java.lang.Object
   public static final net.corda.core.flows.ContractUpgradeFlow INSTANCE
 ##
-@net.corda.core.flows.StartableByRPC public static final class net.corda.core.flows.ContractUpgradeFlow$Authorise extends net.corda.core.flows.FlowLogic
-  public <init>(net.corda.core.contracts.StateAndRef, Class)
-  @co.paralleluniverse.fibers.Suspendable @org.jetbrains.annotations.Nullable public Void call()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.StateAndRef getStateAndRef()
+@StartableByRPC
+public static final class net.corda.core.flows.ContractUpgradeFlow$Authorise extends net.corda.core.flows.FlowLogic
+  public <init>(net.corda.core.contracts.StateAndRef<?>, Class<? extends net.corda.core.contracts.UpgradedContract<?, ?>>)
+  @Suspendable
+  @Nullable
+  public Void call()
+  @NotNull
+  public final net.corda.core.contracts.StateAndRef<?> getStateAndRef()
 ##
-@net.corda.core.flows.StartableByRPC public static final class net.corda.core.flows.ContractUpgradeFlow$Deauthorise extends net.corda.core.flows.FlowLogic
+@StartableByRPC
+public static final class net.corda.core.flows.ContractUpgradeFlow$Deauthorise extends net.corda.core.flows.FlowLogic
   public <init>(net.corda.core.contracts.StateRef)
-  @co.paralleluniverse.fibers.Suspendable @org.jetbrains.annotations.Nullable public Void call()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.StateRef getStateRef()
+  @Suspendable
+  @Nullable
+  public Void call()
+  @NotNull
+  public final net.corda.core.contracts.StateRef getStateRef()
 ##
-@net.corda.core.flows.InitiatingFlow @net.corda.core.flows.StartableByRPC public static final class net.corda.core.flows.ContractUpgradeFlow$Initiate extends net.corda.core.flows.AbstractStateReplacementFlow$Instigator
-  public <init>(net.corda.core.contracts.StateAndRef, Class)
-  @co.paralleluniverse.fibers.Suspendable @org.jetbrains.annotations.NotNull protected net.corda.core.flows.AbstractStateReplacementFlow$UpgradeTx assembleTx()
+@InitiatingFlow
+@StartableByRPC
+public static final class net.corda.core.flows.ContractUpgradeFlow$Initiate extends net.corda.core.flows.AbstractStateReplacementFlow$Instigator
+  public <init>(net.corda.core.contracts.StateAndRef<? extends OldState>, Class<? extends net.corda.core.contracts.UpgradedContract<? super OldState, ? extends NewState>>)
+  @Suspendable
+  @NotNull
+  protected net.corda.core.flows.AbstractStateReplacementFlow$UpgradeTx assembleTx()
 ##
 public class net.corda.core.flows.DataVendingFlow extends net.corda.core.flows.FlowLogic
   public <init>(net.corda.core.flows.FlowSession, Object)
-  @co.paralleluniverse.fibers.Suspendable @org.jetbrains.annotations.Nullable public Void call()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.FlowSession getOtherSideSession()
-  @org.jetbrains.annotations.NotNull public final Object getPayload()
-  @co.paralleluniverse.fibers.Suspendable @org.jetbrains.annotations.NotNull protected net.corda.core.utilities.UntrustworthyData sendPayloadAndReceiveDataRequest(net.corda.core.flows.FlowSession, Object)
-  @co.paralleluniverse.fibers.Suspendable protected void verifyDataRequest(net.corda.core.internal.FetchDataFlow$Request$Data)
+  @Suspendable
+  @Nullable
+  public Void call()
+  @NotNull
+  public final net.corda.core.flows.FlowSession getOtherSideSession()
+  @NotNull
+  public final Object getPayload()
+  @Suspendable
+  @NotNull
+  protected net.corda.core.utilities.UntrustworthyData<net.corda.core.internal.FetchDataFlow$Request> sendPayloadAndReceiveDataRequest(net.corda.core.flows.FlowSession, Object)
+  @Suspendable
+  protected void verifyDataRequest(net.corda.core.internal.FetchDataFlow$Request$Data)
 ##
-@net.corda.core.flows.InitiatingFlow public final class net.corda.core.flows.FinalityFlow extends net.corda.core.flows.FlowLogic
+@InitiatingFlow
+public final class net.corda.core.flows.FinalityFlow extends net.corda.core.flows.FlowLogic
   public <init>(net.corda.core.transactions.SignedTransaction)
-  public <init>(net.corda.core.transactions.SignedTransaction, Set)
-  public <init>(net.corda.core.transactions.SignedTransaction, Set, net.corda.core.utilities.ProgressTracker)
+  public <init>(net.corda.core.transactions.SignedTransaction, java.util.Set<net.corda.core.identity.Party>)
+  public <init>(net.corda.core.transactions.SignedTransaction, java.util.Set<net.corda.core.identity.Party>, net.corda.core.utilities.ProgressTracker)
   public <init>(net.corda.core.transactions.SignedTransaction, net.corda.core.utilities.ProgressTracker)
-  @co.paralleluniverse.fibers.Suspendable @org.jetbrains.annotations.NotNull public net.corda.core.transactions.SignedTransaction call()
-  @org.jetbrains.annotations.NotNull public net.corda.core.utilities.ProgressTracker getProgressTracker()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.SignedTransaction getTransaction()
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.utilities.ProgressTracker tracker()
+  @Suspendable
+  @NotNull
+  public net.corda.core.transactions.SignedTransaction call()
+  @NotNull
+  public net.corda.core.utilities.ProgressTracker getProgressTracker()
+  @NotNull
+  public final net.corda.core.transactions.SignedTransaction getTransaction()
+  @NotNull
+  public static final net.corda.core.utilities.ProgressTracker tracker()
   public static final net.corda.core.flows.FinalityFlow$Companion Companion
 ##
 public static final class net.corda.core.flows.FinalityFlow$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ProgressTracker tracker()
+  @NotNull
+  public final net.corda.core.utilities.ProgressTracker tracker()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.flows.FinalityFlow$Companion$BROADCASTING extends net.corda.core.utilities.ProgressTracker$Step
+@CordaSerializable
+public static final class net.corda.core.flows.FinalityFlow$Companion$BROADCASTING extends net.corda.core.utilities.ProgressTracker$Step
   public static final net.corda.core.flows.FinalityFlow$Companion$BROADCASTING INSTANCE
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.flows.FinalityFlow$Companion$NOTARISING extends net.corda.core.utilities.ProgressTracker$Step
-  @org.jetbrains.annotations.NotNull public net.corda.core.utilities.ProgressTracker childProgressTracker()
+@CordaSerializable
+public static final class net.corda.core.flows.FinalityFlow$Companion$NOTARISING extends net.corda.core.utilities.ProgressTracker$Step
+  @NotNull
+  public net.corda.core.utilities.ProgressTracker childProgressTracker()
   public static final net.corda.core.flows.FinalityFlow$Companion$NOTARISING INSTANCE
 ##
-@net.corda.core.serialization.CordaSerializable public class net.corda.core.flows.FlowException extends net.corda.core.CordaException implements net.corda.core.flows.IdentifiableException
+@CordaSerializable
+public class net.corda.core.flows.FlowException extends net.corda.core.CordaException implements net.corda.core.flows.IdentifiableException
   public <init>()
   public <init>(String)
   public <init>(String, Throwable)
   public <init>(Throwable)
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.flows.FlowInfo extends java.lang.Object
+@CordaSerializable
+public final class net.corda.core.flows.FlowInfo extends java.lang.Object
   public <init>(int, String)
   public final int component1()
-  @org.jetbrains.annotations.NotNull public final String component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.FlowInfo copy(int, String)
+  @NotNull
+  public final String component2()
+  @NotNull
+  public final net.corda.core.flows.FlowInfo copy(int, String)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final String getAppName()
+  @NotNull
+  public final String getAppName()
   public final int getFlowVersion()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public abstract class net.corda.core.flows.FlowInitiator extends java.lang.Object implements java.security.Principal
-  @org.jetbrains.annotations.NotNull public final net.corda.core.context.InvocationContext getInvocationContext()
+@CordaSerializable
+public abstract class net.corda.core.flows.FlowInitiator extends java.lang.Object implements java.security.Principal
+  @NotNull
+  public final net.corda.core.context.InvocationContext getInvocationContext()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.flows.FlowInitiator$Peer extends net.corda.core.flows.FlowInitiator
+@CordaSerializable
+public static final class net.corda.core.flows.FlowInitiator$Peer extends net.corda.core.flows.FlowInitiator
   public <init>(net.corda.core.identity.Party)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.Party component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.FlowInitiator$Peer copy(net.corda.core.identity.Party)
+  @NotNull
+  public final net.corda.core.identity.Party component1()
+  @NotNull
+  public final net.corda.core.flows.FlowInitiator$Peer copy(net.corda.core.identity.Party)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public String getName()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.Party getParty()
+  @NotNull
+  public String getName()
+  @NotNull
+  public final net.corda.core.identity.Party getParty()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.flows.FlowInitiator$RPC extends net.corda.core.flows.FlowInitiator
+@CordaSerializable
+public static final class net.corda.core.flows.FlowInitiator$RPC extends net.corda.core.flows.FlowInitiator
   public <init>(String)
-  @org.jetbrains.annotations.NotNull public final String component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.FlowInitiator$RPC copy(String)
+  @NotNull
+  public final String component1()
+  @NotNull
+  public final net.corda.core.flows.FlowInitiator$RPC copy(String)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public String getName()
-  @org.jetbrains.annotations.NotNull public final String getUsername()
+  @NotNull
+  public String getName()
+  @NotNull
+  public final String getUsername()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.flows.FlowInitiator$Scheduled extends net.corda.core.flows.FlowInitiator
+@CordaSerializable
+public static final class net.corda.core.flows.FlowInitiator$Scheduled extends net.corda.core.flows.FlowInitiator
   public <init>(net.corda.core.contracts.ScheduledStateRef)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.ScheduledStateRef component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.FlowInitiator$Scheduled copy(net.corda.core.contracts.ScheduledStateRef)
+  @NotNull
+  public final net.corda.core.contracts.ScheduledStateRef component1()
+  @NotNull
+  public final net.corda.core.flows.FlowInitiator$Scheduled copy(net.corda.core.contracts.ScheduledStateRef)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public String getName()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.ScheduledStateRef getScheduledState()
+  @NotNull
+  public String getName()
+  @NotNull
+  public final net.corda.core.contracts.ScheduledStateRef getScheduledState()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.flows.FlowInitiator$Service extends net.corda.core.flows.FlowInitiator
+@CordaSerializable
+public static final class net.corda.core.flows.FlowInitiator$Service extends net.corda.core.flows.FlowInitiator
   public <init>(String)
-  @org.jetbrains.annotations.NotNull public final String component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.FlowInitiator$Service copy(String)
+  @NotNull
+  public final String component1()
+  @NotNull
+  public final net.corda.core.flows.FlowInitiator$Service copy(String)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public String getName()
-  @org.jetbrains.annotations.NotNull public final String getServiceClassName()
+  @NotNull
+  public String getName()
+  @NotNull
+  public final String getServiceClassName()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.flows.FlowInitiator$Shell extends net.corda.core.flows.FlowInitiator
-  @org.jetbrains.annotations.NotNull public String getName()
+@CordaSerializable
+public static final class net.corda.core.flows.FlowInitiator$Shell extends net.corda.core.flows.FlowInitiator
+  @NotNull
+  public String getName()
   public static final net.corda.core.flows.FlowInitiator$Shell INSTANCE
 ##
 public abstract class net.corda.core.flows.FlowLogic extends java.lang.Object
   public <init>()
-  @co.paralleluniverse.fibers.Suspendable public abstract Object call()
-  public final void checkFlowPermission(String, Map)
-  @co.paralleluniverse.fibers.Suspendable @org.jetbrains.annotations.Nullable public final net.corda.core.flows.FlowStackSnapshot flowStackSnapshot()
-  @org.jetbrains.annotations.Nullable public static final net.corda.core.flows.FlowLogic getCurrentTopLevel()
-  @co.paralleluniverse.fibers.Suspendable @kotlin.Deprecated @org.jetbrains.annotations.NotNull public final net.corda.core.flows.FlowInfo getFlowInfo(net.corda.core.identity.Party)
-  @org.jetbrains.annotations.NotNull public final org.slf4j.Logger getLogger()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.Party getOurIdentity()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.PartyAndCertificate getOurIdentityAndCert()
-  @org.jetbrains.annotations.Nullable public net.corda.core.utilities.ProgressTracker getProgressTracker()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.StateMachineRunId getRunId()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.ServiceHub getServiceHub()
-  @co.paralleluniverse.fibers.Suspendable @org.jetbrains.annotations.NotNull public final net.corda.core.flows.FlowSession initiateFlow(net.corda.core.identity.Party)
-  @co.paralleluniverse.fibers.Suspendable public final void persistFlowStackSnapshot()
-  @co.paralleluniverse.fibers.Suspendable @kotlin.Deprecated @org.jetbrains.annotations.NotNull public net.corda.core.utilities.UntrustworthyData receive(Class, net.corda.core.identity.Party)
-  @co.paralleluniverse.fibers.Suspendable @org.jetbrains.annotations.NotNull public List receiveAll(Class, List)
-  @co.paralleluniverse.fibers.Suspendable @org.jetbrains.annotations.NotNull public Map receiveAllMap(Map)
-  public final void recordAuditEvent(String, String, Map)
-  @co.paralleluniverse.fibers.Suspendable @kotlin.Deprecated public void send(net.corda.core.identity.Party, Object)
-  @co.paralleluniverse.fibers.Suspendable @kotlin.Deprecated @org.jetbrains.annotations.NotNull public net.corda.core.utilities.UntrustworthyData sendAndReceive(Class, net.corda.core.identity.Party, Object)
-  @co.paralleluniverse.fibers.Suspendable public static final void sleep(java.time.Duration)
-  @co.paralleluniverse.fibers.Suspendable public Object subFlow(net.corda.core.flows.FlowLogic)
-  @org.jetbrains.annotations.Nullable public final net.corda.core.messaging.DataFeed track()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.messaging.DataFeed trackStepsTree()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.messaging.DataFeed trackStepsTreeIndex()
-  @co.paralleluniverse.fibers.Suspendable @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.SignedTransaction waitForLedgerCommit(net.corda.core.crypto.SecureHash)
-  @co.paralleluniverse.fibers.Suspendable @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.SignedTransaction waitForLedgerCommit(net.corda.core.crypto.SecureHash, boolean)
+  @Suspendable
+  public abstract T call()
+  public final void checkFlowPermission(String, java.util.Map<String, String>)
+  @Suspendable
+  @Nullable
+  public final net.corda.core.flows.FlowStackSnapshot flowStackSnapshot()
+  @Nullable
+  public static final net.corda.core.flows.FlowLogic<?> getCurrentTopLevel()
+  @Suspendable
+  @NotNull
+  public final net.corda.core.flows.FlowInfo getFlowInfo(net.corda.core.identity.Party)
+  @NotNull
+  public final org.slf4j.Logger getLogger()
+  @NotNull
+  public final net.corda.core.identity.Party getOurIdentity()
+  @NotNull
+  public final net.corda.core.identity.PartyAndCertificate getOurIdentityAndCert()
+  @Nullable
+  public net.corda.core.utilities.ProgressTracker getProgressTracker()
+  @NotNull
+  public final net.corda.core.flows.StateMachineRunId getRunId()
+  @NotNull
+  public final net.corda.core.node.ServiceHub getServiceHub()
+  @Suspendable
+  @NotNull
+  public final net.corda.core.flows.FlowSession initiateFlow(net.corda.core.identity.Party)
+  @Suspendable
+  public final void persistFlowStackSnapshot()
+  @Suspendable
+  @NotNull
+  public net.corda.core.utilities.UntrustworthyData<R> receive(Class<R>, net.corda.core.identity.Party)
+  @Suspendable
+  @NotNull
+  public java.util.List<net.corda.core.utilities.UntrustworthyData<R>> receiveAll(Class<R>, java.util.List<? extends net.corda.core.flows.FlowSession>)
+  @Suspendable
+  @NotNull
+  public java.util.Map<net.corda.core.flows.FlowSession, net.corda.core.utilities.UntrustworthyData<Object>> receiveAllMap(java.util.Map<net.corda.core.flows.FlowSession, ? extends Class<?>>)
+  public final void recordAuditEvent(String, String, java.util.Map<String, String>)
+  @Suspendable
+  public void send(net.corda.core.identity.Party, Object)
+  @Suspendable
+  @NotNull
+  public net.corda.core.utilities.UntrustworthyData<R> sendAndReceive(Class<R>, net.corda.core.identity.Party, Object)
+  @Suspendable
+  public static final void sleep(java.time.Duration)
+  @Suspendable
+  public R subFlow(net.corda.core.flows.FlowLogic<? extends R>)
+  @Nullable
+  public final net.corda.core.messaging.DataFeed<String, String> track()
+  @Nullable
+  public final net.corda.core.messaging.DataFeed<java.util.List<kotlin.Pair<Integer, String>>, java.util.List<kotlin.Pair<Integer, String>>> trackStepsTree()
+  @Nullable
+  public final net.corda.core.messaging.DataFeed<Integer, Integer> trackStepsTreeIndex()
+  @Suspendable
+  @NotNull
+  public final net.corda.core.transactions.SignedTransaction waitForLedgerCommit(net.corda.core.crypto.SecureHash)
+  @Suspendable
+  @NotNull
+  public final net.corda.core.transactions.SignedTransaction waitForLedgerCommit(net.corda.core.crypto.SecureHash, boolean)
   public static final net.corda.core.flows.FlowLogic$Companion Companion
 ##
 public static final class net.corda.core.flows.FlowLogic$Companion extends java.lang.Object
-  @org.jetbrains.annotations.Nullable public final net.corda.core.flows.FlowLogic getCurrentTopLevel()
-  @co.paralleluniverse.fibers.Suspendable public final void sleep(java.time.Duration)
+  @Nullable
+  public final net.corda.core.flows.FlowLogic<?> getCurrentTopLevel()
+  @Suspendable
+  public final void sleep(java.time.Duration)
 ##
-@net.corda.core.DoNotImplement @net.corda.core.serialization.CordaSerializable public interface net.corda.core.flows.FlowLogicRef
+@DoNotImplement
+@CordaSerializable
+public interface net.corda.core.flows.FlowLogicRef
 ##
-@net.corda.core.DoNotImplement public interface net.corda.core.flows.FlowLogicRefFactory
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.flows.FlowLogicRef create(Class, Object...)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.flows.FlowLogicRef create(String, Object...)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.flows.FlowLogic toFlowLogic(net.corda.core.flows.FlowLogicRef)
+@DoNotImplement
+public interface net.corda.core.flows.FlowLogicRefFactory
+  @NotNull
+  public abstract net.corda.core.flows.FlowLogicRef create(Class<? extends net.corda.core.flows.FlowLogic<?>>, Object...)
+  @NotNull
+  public abstract net.corda.core.flows.FlowLogicRef create(String, Object...)
+  @NotNull
+  public abstract net.corda.core.flows.FlowLogic<?> toFlowLogic(net.corda.core.flows.FlowLogicRef)
 ##
-@net.corda.core.DoNotImplement public abstract class net.corda.core.flows.FlowSession extends java.lang.Object
+@DoNotImplement
+public abstract class net.corda.core.flows.FlowSession extends java.lang.Object
   public <init>()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.identity.Party getCounterparty()
-  @co.paralleluniverse.fibers.Suspendable @org.jetbrains.annotations.NotNull public abstract net.corda.core.flows.FlowInfo getCounterpartyFlowInfo()
-  @co.paralleluniverse.fibers.Suspendable @org.jetbrains.annotations.NotNull public abstract net.corda.core.flows.FlowInfo getCounterpartyFlowInfo(boolean)
-  @co.paralleluniverse.fibers.Suspendable @org.jetbrains.annotations.NotNull public abstract net.corda.core.utilities.UntrustworthyData receive(Class)
-  @co.paralleluniverse.fibers.Suspendable @org.jetbrains.annotations.NotNull public abstract net.corda.core.utilities.UntrustworthyData receive(Class, boolean)
-  @co.paralleluniverse.fibers.Suspendable public abstract void send(Object)
-  @co.paralleluniverse.fibers.Suspendable public abstract void send(Object, boolean)
-  @co.paralleluniverse.fibers.Suspendable @org.jetbrains.annotations.NotNull public abstract net.corda.core.utilities.UntrustworthyData sendAndReceive(Class, Object)
-  @co.paralleluniverse.fibers.Suspendable @org.jetbrains.annotations.NotNull public abstract net.corda.core.utilities.UntrustworthyData sendAndReceive(Class, Object, boolean)
+  @NotNull
+  public abstract net.corda.core.identity.Party getCounterparty()
+  @Suspendable
+  @NotNull
+  public abstract net.corda.core.flows.FlowInfo getCounterpartyFlowInfo()
+  @Suspendable
+  @NotNull
+  public abstract net.corda.core.flows.FlowInfo getCounterpartyFlowInfo(boolean)
+  @Suspendable
+  @NotNull
+  public abstract net.corda.core.utilities.UntrustworthyData<R> receive(Class<R>)
+  @Suspendable
+  @NotNull
+  public abstract net.corda.core.utilities.UntrustworthyData<R> receive(Class<R>, boolean)
+  @Suspendable
+  public abstract void send(Object)
+  @Suspendable
+  public abstract void send(Object, boolean)
+  @Suspendable
+  @NotNull
+  public abstract net.corda.core.utilities.UntrustworthyData<R> sendAndReceive(Class<R>, Object)
+  @Suspendable
+  @NotNull
+  public abstract net.corda.core.utilities.UntrustworthyData<R> sendAndReceive(Class<R>, Object, boolean)
 ##
 public final class net.corda.core.flows.FlowStackSnapshot extends java.lang.Object
-  public <init>(java.time.Instant, String, List)
-  @org.jetbrains.annotations.NotNull public final java.time.Instant component1()
-  @org.jetbrains.annotations.NotNull public final String component2()
-  @org.jetbrains.annotations.NotNull public final List component3()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.FlowStackSnapshot copy(java.time.Instant, String, List)
+  public <init>(java.time.Instant, String, java.util.List<net.corda.core.flows.FlowStackSnapshot$Frame>)
+  @NotNull
+  public final java.time.Instant component1()
+  @NotNull
+  public final String component2()
+  @NotNull
+  public final java.util.List<net.corda.core.flows.FlowStackSnapshot$Frame> component3()
+  @NotNull
+  public final net.corda.core.flows.FlowStackSnapshot copy(java.time.Instant, String, java.util.List<net.corda.core.flows.FlowStackSnapshot$Frame>)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final String getFlowClass()
-  @org.jetbrains.annotations.NotNull public final List getStackFrames()
-  @org.jetbrains.annotations.NotNull public final java.time.Instant getTime()
+  @NotNull
+  public final String getFlowClass()
+  @NotNull
+  public final java.util.List<net.corda.core.flows.FlowStackSnapshot$Frame> getStackFrames()
+  @NotNull
+  public final java.time.Instant getTime()
   public int hashCode()
   public String toString()
 ##
 public static final class net.corda.core.flows.FlowStackSnapshot$Frame extends java.lang.Object
-  public <init>(StackTraceElement, List)
-  @org.jetbrains.annotations.NotNull public final StackTraceElement component1()
-  @org.jetbrains.annotations.NotNull public final List component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.FlowStackSnapshot$Frame copy(StackTraceElement, List)
+  public <init>(StackTraceElement, java.util.List<?>)
+  @NotNull
+  public final StackTraceElement component1()
+  @NotNull
+  public final java.util.List<Object> component2()
+  @NotNull
+  public final net.corda.core.flows.FlowStackSnapshot$Frame copy(StackTraceElement, java.util.List<?>)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final List getStackObjects()
-  @org.jetbrains.annotations.NotNull public final StackTraceElement getStackTraceElement()
+  @NotNull
+  public final java.util.List<Object> getStackObjects()
+  @NotNull
+  public final StackTraceElement getStackTraceElement()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public String toString()
+  @NotNull
+  public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.flows.IllegalFlowLogicException extends java.lang.IllegalArgumentException
-  public <init>(Class, String)
+@CordaSerializable
+public final class net.corda.core.flows.IllegalFlowLogicException extends java.lang.IllegalArgumentException
+  public <init>(Class<?>, String)
   public <init>(String, String)
-  @org.jetbrains.annotations.NotNull public final String getType()
+  @NotNull
+  public final String getType()
 ##
 public @interface net.corda.core.flows.InitiatedBy
-  public abstract Class value()
+  public abstract Class<? extends net.corda.core.flows.FlowLogic<?>> value()
 ##
 public @interface net.corda.core.flows.InitiatingFlow
   public abstract int version()
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.flows.NotarisationPayload extends java.lang.Object
+@CordaSerializable
+public final class net.corda.core.flows.NotarisationPayload extends java.lang.Object
   public <init>(Object, net.corda.core.flows.NotarisationRequestSignature)
-  @org.jetbrains.annotations.NotNull public final Object component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.NotarisationRequestSignature component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.NotarisationPayload copy(Object, net.corda.core.flows.NotarisationRequestSignature)
+  @NotNull
+  public final Object component1()
+  @NotNull
+  public final net.corda.core.flows.NotarisationRequestSignature component2()
+  @NotNull
+  public final net.corda.core.flows.NotarisationPayload copy(Object, net.corda.core.flows.NotarisationRequestSignature)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.CoreTransaction getCoreTransaction()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.NotarisationRequestSignature getRequestSignature()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.SignedTransaction getSignedTransaction()
-  @org.jetbrains.annotations.NotNull public final Object getTransaction()
+  @NotNull
+  public final net.corda.core.transactions.CoreTransaction getCoreTransaction()
+  @NotNull
+  public final net.corda.core.flows.NotarisationRequestSignature getRequestSignature()
+  @NotNull
+  public final net.corda.core.transactions.SignedTransaction getSignedTransaction()
+  @NotNull
+  public final Object getTransaction()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.flows.NotarisationRequest extends java.lang.Object
-  public <init>(List, net.corda.core.crypto.SecureHash)
-  @org.jetbrains.annotations.NotNull public final List getStatesToConsume()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash getTransactionId()
+@CordaSerializable
+public final class net.corda.core.flows.NotarisationRequest extends java.lang.Object
+  public <init>(java.util.List<net.corda.core.contracts.StateRef>, net.corda.core.crypto.SecureHash)
+  @NotNull
+  public final java.util.List<net.corda.core.contracts.StateRef> getStatesToConsume()
+  @NotNull
+  public final net.corda.core.crypto.SecureHash getTransactionId()
   public static final net.corda.core.flows.NotarisationRequest$Companion Companion
 ##
 public static final class net.corda.core.flows.NotarisationRequest$Companion extends java.lang.Object
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.flows.NotarisationRequestSignature extends java.lang.Object
+@CordaSerializable
+public final class net.corda.core.flows.NotarisationRequestSignature extends java.lang.Object
   public <init>(net.corda.core.crypto.DigitalSignature$WithKey, int)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.DigitalSignature$WithKey component1()
+  @NotNull
+  public final net.corda.core.crypto.DigitalSignature$WithKey component1()
   public final int component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.NotarisationRequestSignature copy(net.corda.core.crypto.DigitalSignature$WithKey, int)
+  @NotNull
+  public final net.corda.core.flows.NotarisationRequestSignature copy(net.corda.core.crypto.DigitalSignature$WithKey, int)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.DigitalSignature$WithKey getDigitalSignature()
+  @NotNull
+  public final net.corda.core.crypto.DigitalSignature$WithKey getDigitalSignature()
   public final int getPlatformVersion()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.flows.NotarisationResponse extends java.lang.Object
-  public <init>(List)
-  @org.jetbrains.annotations.NotNull public final List component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.NotarisationResponse copy(List)
+@CordaSerializable
+public final class net.corda.core.flows.NotarisationResponse extends java.lang.Object
+  public <init>(java.util.List<net.corda.core.crypto.TransactionSignature>)
+  @NotNull
+  public final java.util.List<net.corda.core.crypto.TransactionSignature> component1()
+  @NotNull
+  public final net.corda.core.flows.NotarisationResponse copy(java.util.List<net.corda.core.crypto.TransactionSignature>)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final List getSignatures()
+  @NotNull
+  public final java.util.List<net.corda.core.crypto.TransactionSignature> getSignatures()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.flows.InitiatingFlow public final class net.corda.core.flows.NotaryChangeFlow extends net.corda.core.flows.AbstractStateReplacementFlow$Instigator
-  public <init>(net.corda.core.contracts.StateAndRef, net.corda.core.identity.Party, net.corda.core.utilities.ProgressTracker)
-  @org.jetbrains.annotations.NotNull protected net.corda.core.flows.AbstractStateReplacementFlow$UpgradeTx assembleTx()
+@InitiatingFlow
+public final class net.corda.core.flows.NotaryChangeFlow extends net.corda.core.flows.AbstractStateReplacementFlow$Instigator
+  public <init>(net.corda.core.contracts.StateAndRef<? extends T>, net.corda.core.identity.Party, net.corda.core.utilities.ProgressTracker)
+  @NotNull
+  protected net.corda.core.flows.AbstractStateReplacementFlow$UpgradeTx assembleTx()
 ##
-@net.corda.core.serialization.CordaSerializable public abstract class net.corda.core.flows.NotaryError extends java.lang.Object
+@CordaSerializable
+public abstract class net.corda.core.flows.NotaryError extends java.lang.Object
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.flows.NotaryError$Conflict extends net.corda.core.flows.NotaryError
-  public <init>(net.corda.core.crypto.SecureHash, Map)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash component1()
-  @org.jetbrains.annotations.NotNull public final Map component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.NotaryError$Conflict copy(net.corda.core.crypto.SecureHash, Map)
+@CordaSerializable
+public static final class net.corda.core.flows.NotaryError$Conflict extends net.corda.core.flows.NotaryError
+  public <init>(net.corda.core.crypto.SecureHash, java.util.Map<net.corda.core.contracts.StateRef, net.corda.core.flows.StateConsumptionDetails>)
+  @NotNull
+  public final net.corda.core.crypto.SecureHash component1()
+  @NotNull
+  public final java.util.Map<net.corda.core.contracts.StateRef, net.corda.core.flows.StateConsumptionDetails> component2()
+  @NotNull
+  public final net.corda.core.flows.NotaryError$Conflict copy(net.corda.core.crypto.SecureHash, java.util.Map<net.corda.core.contracts.StateRef, net.corda.core.flows.StateConsumptionDetails>)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final Map getConsumedStates()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash getTxId()
+  @NotNull
+  public final java.util.Map<net.corda.core.contracts.StateRef, net.corda.core.flows.StateConsumptionDetails> getConsumedStates()
+  @NotNull
+  public final net.corda.core.crypto.SecureHash getTxId()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public String toString()
+  @NotNull
+  public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.flows.NotaryError$General extends net.corda.core.flows.NotaryError
+@CordaSerializable
+public static final class net.corda.core.flows.NotaryError$General extends net.corda.core.flows.NotaryError
   public <init>(Throwable)
-  @org.jetbrains.annotations.NotNull public final Throwable component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.NotaryError$General copy(Throwable)
+  @NotNull
+  public final Throwable component1()
+  @NotNull
+  public final net.corda.core.flows.NotaryError$General copy(Throwable)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final Throwable getCause()
+  @NotNull
+  public final Throwable getCause()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public String toString()
+  @NotNull
+  public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.flows.NotaryError$RequestSignatureInvalid extends net.corda.core.flows.NotaryError
+@CordaSerializable
+public static final class net.corda.core.flows.NotaryError$RequestSignatureInvalid extends net.corda.core.flows.NotaryError
   public <init>(Throwable)
-  @org.jetbrains.annotations.NotNull public final Throwable component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.NotaryError$RequestSignatureInvalid copy(Throwable)
+  @NotNull
+  public final Throwable component1()
+  @NotNull
+  public final net.corda.core.flows.NotaryError$RequestSignatureInvalid copy(Throwable)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final Throwable getCause()
+  @NotNull
+  public final Throwable getCause()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public String toString()
+  @NotNull
+  public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.flows.NotaryError$TimeWindowInvalid extends net.corda.core.flows.NotaryError
+@CordaSerializable
+public static final class net.corda.core.flows.NotaryError$TimeWindowInvalid extends net.corda.core.flows.NotaryError
   public <init>(java.time.Instant, net.corda.core.contracts.TimeWindow)
-  @org.jetbrains.annotations.NotNull public final java.time.Instant component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.TimeWindow component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.NotaryError$TimeWindowInvalid copy(java.time.Instant, net.corda.core.contracts.TimeWindow)
+  @NotNull
+  public final java.time.Instant component1()
+  @NotNull
+  public final net.corda.core.contracts.TimeWindow component2()
+  @NotNull
+  public final net.corda.core.flows.NotaryError$TimeWindowInvalid copy(java.time.Instant, net.corda.core.contracts.TimeWindow)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final java.time.Instant getCurrentTime()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.TimeWindow getTxTimeWindow()
+  @NotNull
+  public final java.time.Instant getCurrentTime()
+  @NotNull
+  public final net.corda.core.contracts.TimeWindow getTxTimeWindow()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public String toString()
+  @NotNull
+  public String toString()
   public static final net.corda.core.flows.NotaryError$TimeWindowInvalid$Companion Companion
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.flows.NotaryError$TimeWindowInvalid INSTANCE
+  @NotNull
+  public static final net.corda.core.flows.NotaryError$TimeWindowInvalid INSTANCE
 ##
 public static final class net.corda.core.flows.NotaryError$TimeWindowInvalid$Companion extends java.lang.Object
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.flows.NotaryError$TransactionInvalid extends net.corda.core.flows.NotaryError
+@CordaSerializable
+public static final class net.corda.core.flows.NotaryError$TransactionInvalid extends net.corda.core.flows.NotaryError
   public <init>(Throwable)
-  @org.jetbrains.annotations.NotNull public final Throwable component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.NotaryError$TransactionInvalid copy(Throwable)
+  @NotNull
+  public final Throwable component1()
+  @NotNull
+  public final net.corda.core.flows.NotaryError$TransactionInvalid copy(Throwable)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final Throwable getCause()
+  @NotNull
+  public final Throwable getCause()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public String toString()
+  @NotNull
+  public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.flows.NotaryError$WrongNotary extends net.corda.core.flows.NotaryError
+@CordaSerializable
+public static final class net.corda.core.flows.NotaryError$WrongNotary extends net.corda.core.flows.NotaryError
   public static final net.corda.core.flows.NotaryError$WrongNotary INSTANCE
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.flows.NotaryException extends net.corda.core.flows.FlowException
+@CordaSerializable
+public final class net.corda.core.flows.NotaryException extends net.corda.core.flows.FlowException
   public <init>(net.corda.core.flows.NotaryError, net.corda.core.crypto.SecureHash)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.NotaryError getError()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.crypto.SecureHash getTxId()
+  @NotNull
+  public final net.corda.core.flows.NotaryError getError()
+  @Nullable
+  public final net.corda.core.crypto.SecureHash getTxId()
 ##
 public final class net.corda.core.flows.NotaryFlow extends java.lang.Object
   public <init>()
 ##
-@net.corda.core.DoNotImplement @net.corda.core.flows.InitiatingFlow public static class net.corda.core.flows.NotaryFlow$Client extends net.corda.core.flows.FlowLogic
+@DoNotImplement
+@InitiatingFlow
+public static class net.corda.core.flows.NotaryFlow$Client extends net.corda.core.flows.FlowLogic
   public <init>(net.corda.core.transactions.SignedTransaction)
   public <init>(net.corda.core.transactions.SignedTransaction, net.corda.core.utilities.ProgressTracker)
-  @co.paralleluniverse.fibers.Suspendable @org.jetbrains.annotations.NotNull public List call()
-  @org.jetbrains.annotations.NotNull protected final net.corda.core.identity.Party checkTransaction()
-  @org.jetbrains.annotations.NotNull public net.corda.core.utilities.ProgressTracker getProgressTracker()
-  @co.paralleluniverse.fibers.Suspendable @org.jetbrains.annotations.NotNull protected final net.corda.core.utilities.UntrustworthyData notarise(net.corda.core.identity.Party)
-  @org.jetbrains.annotations.NotNull protected final List validateResponse(net.corda.core.utilities.UntrustworthyData, net.corda.core.identity.Party)
+  @Suspendable
+  @NotNull
+  public java.util.List<net.corda.core.crypto.TransactionSignature> call()
+  @NotNull
+  protected final net.corda.core.identity.Party checkTransaction()
+  @NotNull
+  public net.corda.core.utilities.ProgressTracker getProgressTracker()
+  @Suspendable
+  @NotNull
+  protected final net.corda.core.utilities.UntrustworthyData<net.corda.core.flows.NotarisationResponse> notarise(net.corda.core.identity.Party)
+  @NotNull
+  protected final java.util.List<net.corda.core.crypto.TransactionSignature> validateResponse(net.corda.core.utilities.UntrustworthyData<net.corda.core.flows.NotarisationResponse>, net.corda.core.identity.Party)
   public static final net.corda.core.flows.NotaryFlow$Client$Companion Companion
 ##
 public static final class net.corda.core.flows.NotaryFlow$Client$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ProgressTracker tracker()
+  @NotNull
+  public final net.corda.core.utilities.ProgressTracker tracker()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.flows.NotaryFlow$Client$Companion$REQUESTING extends net.corda.core.utilities.ProgressTracker$Step
+@CordaSerializable
+public static final class net.corda.core.flows.NotaryFlow$Client$Companion$REQUESTING extends net.corda.core.utilities.ProgressTracker$Step
   public static final net.corda.core.flows.NotaryFlow$Client$Companion$REQUESTING INSTANCE
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.flows.NotaryFlow$Client$Companion$VALIDATING extends net.corda.core.utilities.ProgressTracker$Step
+@CordaSerializable
+public static final class net.corda.core.flows.NotaryFlow$Client$Companion$VALIDATING extends net.corda.core.utilities.ProgressTracker$Step
   public static final net.corda.core.flows.NotaryFlow$Client$Companion$VALIDATING INSTANCE
 ##
 public final class net.corda.core.flows.ReceiveStateAndRefFlow extends net.corda.core.flows.FlowLogic
   public <init>(net.corda.core.flows.FlowSession)
-  @co.paralleluniverse.fibers.Suspendable @org.jetbrains.annotations.NotNull public List call()
+  @Suspendable
+  @NotNull
+  public java.util.List<net.corda.core.contracts.StateAndRef<T>> call()
 ##
 public final class net.corda.core.flows.ReceiveTransactionFlow extends net.corda.core.flows.FlowLogic
   public <init>(net.corda.core.flows.FlowSession)
   public <init>(net.corda.core.flows.FlowSession, boolean)
   public <init>(net.corda.core.flows.FlowSession, boolean, net.corda.core.node.StatesToRecord)
-  @co.paralleluniverse.fibers.Suspendable @org.jetbrains.annotations.NotNull public net.corda.core.transactions.SignedTransaction call()
+  @Suspendable
+  @NotNull
+  public net.corda.core.transactions.SignedTransaction call()
 ##
 public @interface net.corda.core.flows.SchedulableFlow
 ##
 public class net.corda.core.flows.SendStateAndRefFlow extends net.corda.core.flows.DataVendingFlow
-  public <init>(net.corda.core.flows.FlowSession, List)
+  public <init>(net.corda.core.flows.FlowSession, java.util.List<? extends net.corda.core.contracts.StateAndRef<?>>)
 ##
 public class net.corda.core.flows.SendTransactionFlow extends net.corda.core.flows.DataVendingFlow
   public <init>(net.corda.core.flows.FlowSession, net.corda.core.transactions.SignedTransaction)
 ##
 public abstract class net.corda.core.flows.SignTransactionFlow extends net.corda.core.flows.FlowLogic
   public <init>(net.corda.core.flows.FlowSession, net.corda.core.utilities.ProgressTracker)
-  @co.paralleluniverse.fibers.Suspendable @org.jetbrains.annotations.NotNull public net.corda.core.transactions.SignedTransaction call()
-  @co.paralleluniverse.fibers.Suspendable protected abstract void checkTransaction(net.corda.core.transactions.SignedTransaction)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.FlowSession getOtherSideSession()
-  @org.jetbrains.annotations.NotNull public net.corda.core.utilities.ProgressTracker getProgressTracker()
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.utilities.ProgressTracker tracker()
+  @Suspendable
+  @NotNull
+  public net.corda.core.transactions.SignedTransaction call()
+  @Suspendable
+  protected abstract void checkTransaction(net.corda.core.transactions.SignedTransaction)
+  @NotNull
+  public final net.corda.core.flows.FlowSession getOtherSideSession()
+  @NotNull
+  public net.corda.core.utilities.ProgressTracker getProgressTracker()
+  @NotNull
+  public static final net.corda.core.utilities.ProgressTracker tracker()
   public static final net.corda.core.flows.SignTransactionFlow$Companion Companion
 ##
 public static final class net.corda.core.flows.SignTransactionFlow$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ProgressTracker tracker()
+  @NotNull
+  public final net.corda.core.utilities.ProgressTracker tracker()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.flows.SignTransactionFlow$Companion$RECEIVING extends net.corda.core.utilities.ProgressTracker$Step
+@CordaSerializable
+public static final class net.corda.core.flows.SignTransactionFlow$Companion$RECEIVING extends net.corda.core.utilities.ProgressTracker$Step
   public static final net.corda.core.flows.SignTransactionFlow$Companion$RECEIVING INSTANCE
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.flows.SignTransactionFlow$Companion$SIGNING extends net.corda.core.utilities.ProgressTracker$Step
+@CordaSerializable
+public static final class net.corda.core.flows.SignTransactionFlow$Companion$SIGNING extends net.corda.core.utilities.ProgressTracker$Step
   public static final net.corda.core.flows.SignTransactionFlow$Companion$SIGNING INSTANCE
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.flows.SignTransactionFlow$Companion$VERIFYING extends net.corda.core.utilities.ProgressTracker$Step
+@CordaSerializable
+public static final class net.corda.core.flows.SignTransactionFlow$Companion$VERIFYING extends net.corda.core.utilities.ProgressTracker$Step
   public static final net.corda.core.flows.SignTransactionFlow$Companion$VERIFYING INSTANCE
 ##
 public final class net.corda.core.flows.StackFrameDataToken extends java.lang.Object
   public <init>(String)
-  @org.jetbrains.annotations.NotNull public final String component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.StackFrameDataToken copy(String)
+  @NotNull
+  public final String component1()
+  @NotNull
+  public final net.corda.core.flows.StackFrameDataToken copy(String)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final String getClassName()
+  @NotNull
+  public final String getClassName()
   public int hashCode()
   public String toString()
 ##
@@ -1537,76 +2326,116 @@ public @interface net.corda.core.flows.StartableByRPC
 ##
 public @interface net.corda.core.flows.StartableByService
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.flows.StateConsumptionDetails extends java.lang.Object
+@CordaSerializable
+public final class net.corda.core.flows.StateConsumptionDetails extends java.lang.Object
   public <init>(net.corda.core.crypto.SecureHash)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.StateConsumptionDetails copy(net.corda.core.crypto.SecureHash)
+  @NotNull
+  public final net.corda.core.crypto.SecureHash component1()
+  @NotNull
+  public final net.corda.core.flows.StateConsumptionDetails copy(net.corda.core.crypto.SecureHash)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash getHashOfTransactionId()
+  @NotNull
+  public final net.corda.core.crypto.SecureHash getHashOfTransactionId()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.flows.StateMachineRunId extends java.lang.Object
-  public <init>(UUID)
-  @org.jetbrains.annotations.NotNull public final UUID component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.StateMachineRunId copy(UUID)
+@CordaSerializable
+public final class net.corda.core.flows.StateMachineRunId extends java.lang.Object
+  public <init>(java.util.UUID)
+  @NotNull
+  public final java.util.UUID component1()
+  @NotNull
+  public final net.corda.core.flows.StateMachineRunId copy(java.util.UUID)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final UUID getUuid()
+  @NotNull
+  public final java.util.UUID getUuid()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public String toString()
+  @NotNull
+  public String toString()
   public static final net.corda.core.flows.StateMachineRunId$Companion Companion
 ##
 public static final class net.corda.core.flows.StateMachineRunId$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.StateMachineRunId createRandom()
+  @NotNull
+  public final net.corda.core.flows.StateMachineRunId createRandom()
 ##
-@net.corda.core.serialization.CordaSerializable public class net.corda.core.flows.StateReplacementException extends net.corda.core.flows.FlowException
+@CordaSerializable
+public class net.corda.core.flows.StateReplacementException extends net.corda.core.flows.FlowException
   public <init>()
   public <init>(String)
   public <init>(String, Throwable)
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.flows.UnexpectedFlowEndException extends net.corda.core.CordaRuntimeException implements net.corda.core.flows.IdentifiableException
+@CordaSerializable
+public final class net.corda.core.flows.UnexpectedFlowEndException extends net.corda.core.CordaRuntimeException implements net.corda.core.flows.IdentifiableException
   public <init>(String)
   public <init>(String, Throwable)
-  public <init>(String, Throwable, Long)
 ##
-@net.corda.core.DoNotImplement @net.corda.core.serialization.CordaSerializable public abstract class net.corda.core.identity.AbstractParty extends java.lang.Object
+@DoNotImplement
+@CordaSerializable
+public abstract class net.corda.core.identity.AbstractParty extends java.lang.Object
   public <init>(java.security.PublicKey)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final java.security.PublicKey getOwningKey()
+  @NotNull
+  public final java.security.PublicKey getOwningKey()
   public int hashCode()
-  @org.jetbrains.annotations.Nullable public abstract net.corda.core.identity.CordaX500Name nameOrNull()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.contracts.PartyAndReference ref(net.corda.core.utilities.OpaqueBytes)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.PartyAndReference ref(byte...)
+  @Nullable
+  public abstract net.corda.core.identity.CordaX500Name nameOrNull()
+  @NotNull
+  public abstract net.corda.core.contracts.PartyAndReference ref(net.corda.core.utilities.OpaqueBytes)
+  @NotNull
+  public final net.corda.core.contracts.PartyAndReference ref(byte...)
 ##
-@net.corda.core.DoNotImplement @net.corda.core.serialization.CordaSerializable public final class net.corda.core.identity.AnonymousParty extends net.corda.core.identity.AbstractParty
+@DoNotImplement
+@CordaSerializable
+public final class net.corda.core.identity.AnonymousParty extends net.corda.core.identity.AbstractParty
   public <init>(java.security.PublicKey)
-  @org.jetbrains.annotations.Nullable public net.corda.core.identity.CordaX500Name nameOrNull()
-  @org.jetbrains.annotations.NotNull public net.corda.core.contracts.PartyAndReference ref(net.corda.core.utilities.OpaqueBytes)
-  @org.jetbrains.annotations.NotNull public String toString()
+  @Nullable
+  public net.corda.core.identity.CordaX500Name nameOrNull()
+  @NotNull
+  public net.corda.core.contracts.PartyAndReference ref(net.corda.core.utilities.OpaqueBytes)
+  @NotNull
+  public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.identity.CordaX500Name extends java.lang.Object
+@CordaSerializable
+public final class net.corda.core.identity.CordaX500Name extends java.lang.Object
   public <init>(String, String, String)
   public <init>(String, String, String, String)
   public <init>(String, String, String, String, String, String)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.identity.CordaX500Name build(javax.security.auth.x500.X500Principal)
-  @org.jetbrains.annotations.Nullable public final String component1()
-  @org.jetbrains.annotations.Nullable public final String component2()
-  @org.jetbrains.annotations.NotNull public final String component3()
-  @org.jetbrains.annotations.NotNull public final String component4()
-  @org.jetbrains.annotations.Nullable public final String component5()
-  @org.jetbrains.annotations.NotNull public final String component6()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.CordaX500Name copy(String, String, String, String, String, String)
+  @NotNull
+  public static final net.corda.core.identity.CordaX500Name build(javax.security.auth.x500.X500Principal)
+  @Nullable
+  public final String component1()
+  @Nullable
+  public final String component2()
+  @NotNull
+  public final String component3()
+  @NotNull
+  public final String component4()
+  @Nullable
+  public final String component5()
+  @NotNull
+  public final String component6()
+  @NotNull
+  public final net.corda.core.identity.CordaX500Name copy(String, String, String, String, String, String)
   public boolean equals(Object)
-  @org.jetbrains.annotations.Nullable public final String getCommonName()
-  @org.jetbrains.annotations.NotNull public final String getCountry()
-  @org.jetbrains.annotations.NotNull public final String getLocality()
-  @org.jetbrains.annotations.NotNull public final String getOrganisation()
-  @org.jetbrains.annotations.Nullable public final String getOrganisationUnit()
-  @org.jetbrains.annotations.Nullable public final String getState()
-  @org.jetbrains.annotations.NotNull public final javax.security.auth.x500.X500Principal getX500Principal()
+  @Nullable
+  public final String getCommonName()
+  @NotNull
+  public final String getCountry()
+  @NotNull
+  public final String getLocality()
+  @NotNull
+  public final String getOrganisation()
+  @Nullable
+  public final String getOrganisationUnit()
+  @Nullable
+  public final String getState()
+  @NotNull
+  public final javax.security.auth.x500.X500Principal getX500Principal()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.identity.CordaX500Name parse(String)
-  @org.jetbrains.annotations.NotNull public String toString()
+  @NotNull
+  public static final net.corda.core.identity.CordaX500Name parse(String)
+  @NotNull
+  public String toString()
   public static final net.corda.core.identity.CordaX500Name$Companion Companion
   public static final int LENGTH_COUNTRY = 2
   public static final int MAX_LENGTH_COMMON_NAME = 64
@@ -1616,903 +2445,1457 @@ public static final class net.corda.core.flows.StateMachineRunId$Companion exten
   public static final int MAX_LENGTH_STATE = 64
 ##
 public static final class net.corda.core.identity.CordaX500Name$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.CordaX500Name build(javax.security.auth.x500.X500Principal)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.CordaX500Name parse(String)
+  @NotNull
+  public final net.corda.core.identity.CordaX500Name build(javax.security.auth.x500.X500Principal)
+  @NotNull
+  public final net.corda.core.identity.CordaX500Name parse(String)
 ##
 public final class net.corda.core.identity.IdentityUtils extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public static final Map excludeHostNode(net.corda.core.node.ServiceHub, Map)
-  @org.jetbrains.annotations.NotNull public static final Map excludeNotary(Map, net.corda.core.transactions.SignedTransaction)
-  @org.jetbrains.annotations.NotNull public static final Map groupAbstractPartyByWellKnownParty(net.corda.core.node.ServiceHub, Collection)
-  @org.jetbrains.annotations.NotNull public static final Map groupAbstractPartyByWellKnownParty(net.corda.core.node.ServiceHub, Collection, boolean)
-  @org.jetbrains.annotations.NotNull public static final Map groupPublicKeysByWellKnownParty(net.corda.core.node.ServiceHub, Collection)
-  @org.jetbrains.annotations.NotNull public static final Map groupPublicKeysByWellKnownParty(net.corda.core.node.ServiceHub, Collection, boolean)
+  @NotNull
+  public static final java.util.Map<net.corda.core.identity.Party, T> excludeHostNode(net.corda.core.node.ServiceHub, java.util.Map<net.corda.core.identity.Party, ? extends T>)
+  @NotNull
+  public static final java.util.Map<net.corda.core.identity.Party, T> excludeNotary(java.util.Map<net.corda.core.identity.Party, ? extends T>, net.corda.core.transactions.SignedTransaction)
+  @NotNull
+  public static final java.util.Map<net.corda.core.identity.Party, java.util.List<net.corda.core.identity.AbstractParty>> groupAbstractPartyByWellKnownParty(net.corda.core.node.ServiceHub, java.util.Collection<? extends net.corda.core.identity.AbstractParty>)
+  @NotNull
+  public static final java.util.Map<net.corda.core.identity.Party, java.util.List<net.corda.core.identity.AbstractParty>> groupAbstractPartyByWellKnownParty(net.corda.core.node.ServiceHub, java.util.Collection<? extends net.corda.core.identity.AbstractParty>, boolean)
+  @NotNull
+  public static final java.util.Map<net.corda.core.identity.Party, java.util.List<java.security.PublicKey>> groupPublicKeysByWellKnownParty(net.corda.core.node.ServiceHub, java.util.Collection<? extends java.security.PublicKey>)
+  @NotNull
+  public static final java.util.Map<net.corda.core.identity.Party, java.util.List<java.security.PublicKey>> groupPublicKeysByWellKnownParty(net.corda.core.node.ServiceHub, java.util.Collection<? extends java.security.PublicKey>, boolean)
 ##
-@net.corda.core.DoNotImplement @net.corda.core.serialization.CordaSerializable public final class net.corda.core.identity.Party extends net.corda.core.identity.AbstractParty
+@DoNotImplement
+@CordaSerializable
+public final class net.corda.core.identity.Party extends net.corda.core.identity.AbstractParty
   public <init>(java.security.cert.X509Certificate)
   public <init>(net.corda.core.identity.CordaX500Name, java.security.PublicKey)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.AnonymousParty anonymise()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.CordaX500Name getName()
-  @org.jetbrains.annotations.NotNull public net.corda.core.identity.CordaX500Name nameOrNull()
-  @org.jetbrains.annotations.NotNull public net.corda.core.contracts.PartyAndReference ref(net.corda.core.utilities.OpaqueBytes)
-  @org.jetbrains.annotations.NotNull public String toString()
+  @NotNull
+  public final net.corda.core.identity.AnonymousParty anonymise()
+  @NotNull
+  public final net.corda.core.identity.CordaX500Name getName()
+  @NotNull
+  public net.corda.core.identity.CordaX500Name nameOrNull()
+  @NotNull
+  public net.corda.core.contracts.PartyAndReference ref(net.corda.core.utilities.OpaqueBytes)
+  @NotNull
+  public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.identity.PartyAndCertificate extends java.lang.Object
+@CordaSerializable
+public final class net.corda.core.identity.PartyAndCertificate extends java.lang.Object
   public <init>(java.security.cert.CertPath)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.Party component1()
-  @org.jetbrains.annotations.NotNull public final java.security.cert.X509Certificate component2()
+  @NotNull
+  public final net.corda.core.identity.Party component1()
+  @NotNull
+  public final java.security.cert.X509Certificate component2()
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final java.security.cert.CertPath getCertPath()
-  @org.jetbrains.annotations.NotNull public final java.security.cert.X509Certificate getCertificate()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.CordaX500Name getName()
-  @org.jetbrains.annotations.NotNull public final java.security.PublicKey getOwningKey()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.Party getParty()
+  @NotNull
+  public final java.security.cert.CertPath getCertPath()
+  @NotNull
+  public final java.security.cert.X509Certificate getCertificate()
+  @NotNull
+  public final net.corda.core.identity.CordaX500Name getName()
+  @NotNull
+  public final java.security.PublicKey getOwningKey()
+  @NotNull
+  public final net.corda.core.identity.Party getParty()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public String toString()
-  @org.jetbrains.annotations.NotNull public final java.security.cert.PKIXCertPathValidatorResult verify(java.security.cert.TrustAnchor)
+  @NotNull
+  public String toString()
+  @NotNull
+  public final java.security.cert.PKIXCertPathValidatorResult verify(java.security.cert.TrustAnchor)
 ##
-@net.corda.core.serialization.CordaSerializable public interface net.corda.core.messaging.AllPossibleRecipients extends net.corda.core.messaging.MessageRecipients
+@CordaSerializable
+public interface net.corda.core.messaging.AllPossibleRecipients extends net.corda.core.messaging.MessageRecipients
 ##
-@net.corda.core.DoNotImplement public interface net.corda.core.messaging.CordaRPCOps extends net.corda.core.messaging.RPCOps
+@DoNotImplement
+public interface net.corda.core.messaging.CordaRPCOps extends net.corda.core.messaging.RPCOps
   public abstract void acceptNewNetworkParameters(net.corda.core.crypto.SecureHash)
   public abstract void addVaultTransactionNote(net.corda.core.crypto.SecureHash, String)
   public abstract boolean attachmentExists(net.corda.core.crypto.SecureHash)
   public abstract void clearNetworkMapCache()
-  @org.jetbrains.annotations.NotNull public abstract java.time.Instant currentNodeTime()
+  @NotNull
+  public abstract java.time.Instant currentNodeTime()
   public abstract int getProtocolVersion()
-  @org.jetbrains.annotations.NotNull public abstract Iterable getVaultTransactionNotes(net.corda.core.crypto.SecureHash)
-  @kotlin.Deprecated @net.corda.core.messaging.RPCReturnsObservables @org.jetbrains.annotations.NotNull public abstract net.corda.core.messaging.DataFeed internalVerifiedTransactionsFeed()
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public abstract List internalVerifiedTransactionsSnapshot()
+  @NotNull
+  public abstract Iterable<String> getVaultTransactionNotes(net.corda.core.crypto.SecureHash)
+  @RPCReturnsObservables
+  @NotNull
+  public abstract net.corda.core.messaging.DataFeed<java.util.List<net.corda.core.transactions.SignedTransaction>, net.corda.core.transactions.SignedTransaction> internalVerifiedTransactionsFeed()
+  @NotNull
+  public abstract java.util.List<net.corda.core.transactions.SignedTransaction> internalVerifiedTransactionsSnapshot()
   public abstract boolean isFlowsDrainingModeEnabled()
-  @net.corda.core.messaging.RPCReturnsObservables @org.jetbrains.annotations.NotNull public abstract net.corda.core.messaging.DataFeed networkMapFeed()
-  @org.jetbrains.annotations.NotNull public abstract List networkMapSnapshot()
-  @net.corda.core.messaging.RPCReturnsObservables @org.jetbrains.annotations.NotNull public abstract net.corda.core.messaging.DataFeed networkParametersFeed()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.node.NodeInfo nodeInfo()
-  @org.jetbrains.annotations.Nullable public abstract net.corda.core.node.NodeInfo nodeInfoFromParty(net.corda.core.identity.AbstractParty)
-  @org.jetbrains.annotations.NotNull public abstract List notaryIdentities()
-  @org.jetbrains.annotations.Nullable public abstract net.corda.core.identity.Party notaryPartyFromX500Name(net.corda.core.identity.CordaX500Name)
-  @org.jetbrains.annotations.NotNull public abstract java.io.InputStream openAttachment(net.corda.core.crypto.SecureHash)
-  @org.jetbrains.annotations.NotNull public abstract Set partiesFromName(String, boolean)
-  @org.jetbrains.annotations.Nullable public abstract net.corda.core.identity.Party partyFromKey(java.security.PublicKey)
-  @org.jetbrains.annotations.NotNull public abstract List queryAttachments(net.corda.core.node.services.vault.AttachmentQueryCriteria, net.corda.core.node.services.vault.AttachmentSort)
-  @org.jetbrains.annotations.NotNull public abstract List registeredFlows()
+  @RPCReturnsObservables
+  @NotNull
+  public abstract net.corda.core.messaging.DataFeed<java.util.List<net.corda.core.node.NodeInfo>, net.corda.core.node.services.NetworkMapCache$MapChange> networkMapFeed()
+  @NotNull
+  public abstract java.util.List<net.corda.core.node.NodeInfo> networkMapSnapshot()
+  @RPCReturnsObservables
+  @NotNull
+  public abstract net.corda.core.messaging.DataFeed<net.corda.core.messaging.ParametersUpdateInfo, net.corda.core.messaging.ParametersUpdateInfo> networkParametersFeed()
+  @NotNull
+  public abstract net.corda.core.node.NodeInfo nodeInfo()
+  @Nullable
+  public abstract net.corda.core.node.NodeInfo nodeInfoFromParty(net.corda.core.identity.AbstractParty)
+  @NotNull
+  public abstract java.util.List<net.corda.core.identity.Party> notaryIdentities()
+  @Nullable
+  public abstract net.corda.core.identity.Party notaryPartyFromX500Name(net.corda.core.identity.CordaX500Name)
+  @NotNull
+  public abstract java.io.InputStream openAttachment(net.corda.core.crypto.SecureHash)
+  @NotNull
+  public abstract java.util.Set<net.corda.core.identity.Party> partiesFromName(String, boolean)
+  @Nullable
+  public abstract net.corda.core.identity.Party partyFromKey(java.security.PublicKey)
+  @NotNull
+  public abstract java.util.List<net.corda.core.crypto.SecureHash> queryAttachments(net.corda.core.node.services.vault.AttachmentQueryCriteria, net.corda.core.node.services.vault.AttachmentSort)
+  @NotNull
+  public abstract java.util.List<String> registeredFlows()
   public abstract void setFlowsDrainingModeEnabled(boolean)
-  public abstract void shutdown()
-  @net.corda.core.messaging.RPCReturnsObservables @org.jetbrains.annotations.NotNull public abstract net.corda.core.messaging.FlowHandle startFlowDynamic(Class, Object...)
-  @net.corda.core.messaging.RPCReturnsObservables @org.jetbrains.annotations.NotNull public abstract net.corda.core.messaging.FlowProgressHandle startTrackedFlowDynamic(Class, Object...)
-  @net.corda.core.messaging.RPCReturnsObservables @org.jetbrains.annotations.NotNull public abstract net.corda.core.messaging.DataFeed stateMachineRecordedTransactionMappingFeed()
-  @org.jetbrains.annotations.NotNull public abstract List stateMachineRecordedTransactionMappingSnapshot()
-  @net.corda.core.messaging.RPCReturnsObservables @org.jetbrains.annotations.NotNull public abstract net.corda.core.messaging.DataFeed stateMachinesFeed()
-  @org.jetbrains.annotations.NotNull public abstract List stateMachinesSnapshot()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.crypto.SecureHash uploadAttachment(java.io.InputStream)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.crypto.SecureHash uploadAttachmentWithMetadata(java.io.InputStream, String, String)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.node.services.Vault$Page vaultQuery(Class)
-  @net.corda.core.messaging.RPCReturnsObservables @org.jetbrains.annotations.NotNull public abstract net.corda.core.node.services.Vault$Page vaultQueryBy(net.corda.core.node.services.vault.QueryCriteria, net.corda.core.node.services.vault.PageSpecification, net.corda.core.node.services.vault.Sort, Class)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.node.services.Vault$Page vaultQueryByCriteria(net.corda.core.node.services.vault.QueryCriteria, Class)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.node.services.Vault$Page vaultQueryByWithPagingSpec(Class, net.corda.core.node.services.vault.QueryCriteria, net.corda.core.node.services.vault.PageSpecification)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.node.services.Vault$Page vaultQueryByWithSorting(Class, net.corda.core.node.services.vault.QueryCriteria, net.corda.core.node.services.vault.Sort)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.messaging.DataFeed vaultTrack(Class)
-  @net.corda.core.messaging.RPCReturnsObservables @org.jetbrains.annotations.NotNull public abstract net.corda.core.messaging.DataFeed vaultTrackBy(net.corda.core.node.services.vault.QueryCriteria, net.corda.core.node.services.vault.PageSpecification, net.corda.core.node.services.vault.Sort, Class)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.messaging.DataFeed vaultTrackByCriteria(Class, net.corda.core.node.services.vault.QueryCriteria)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.messaging.DataFeed vaultTrackByWithPagingSpec(Class, net.corda.core.node.services.vault.QueryCriteria, net.corda.core.node.services.vault.PageSpecification)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.messaging.DataFeed vaultTrackByWithSorting(Class, net.corda.core.node.services.vault.QueryCriteria, net.corda.core.node.services.vault.Sort)
-  @net.corda.core.messaging.RPCReturnsObservables @org.jetbrains.annotations.NotNull public abstract net.corda.core.concurrent.CordaFuture waitUntilNetworkReady()
-  @org.jetbrains.annotations.Nullable public abstract net.corda.core.identity.Party wellKnownPartyFromAnonymous(net.corda.core.identity.AbstractParty)
-  @org.jetbrains.annotations.Nullable public abstract net.corda.core.identity.Party wellKnownPartyFromX500Name(net.corda.core.identity.CordaX500Name)
+  @RPCReturnsObservables
+  @NotNull
+  public abstract net.corda.core.messaging.FlowHandle<T> startFlowDynamic(Class<? extends net.corda.core.flows.FlowLogic<? extends T>>, Object...)
+  @RPCReturnsObservables
+  @NotNull
+  public abstract net.corda.core.messaging.FlowProgressHandle<T> startTrackedFlowDynamic(Class<? extends net.corda.core.flows.FlowLogic<? extends T>>, Object...)
+  @RPCReturnsObservables
+  @NotNull
+  public abstract net.corda.core.messaging.DataFeed<java.util.List<net.corda.core.messaging.StateMachineTransactionMapping>, net.corda.core.messaging.StateMachineTransactionMapping> stateMachineRecordedTransactionMappingFeed()
+  @NotNull
+  public abstract java.util.List<net.corda.core.messaging.StateMachineTransactionMapping> stateMachineRecordedTransactionMappingSnapshot()
+  @RPCReturnsObservables
+  @NotNull
+  public abstract net.corda.core.messaging.DataFeed<java.util.List<net.corda.core.messaging.StateMachineInfo>, net.corda.core.messaging.StateMachineUpdate> stateMachinesFeed()
+  @NotNull
+  public abstract java.util.List<net.corda.core.messaging.StateMachineInfo> stateMachinesSnapshot()
+  @NotNull
+  public abstract net.corda.core.crypto.SecureHash uploadAttachment(java.io.InputStream)
+  @NotNull
+  public abstract net.corda.core.crypto.SecureHash uploadAttachmentWithMetadata(java.io.InputStream, String, String)
+  @NotNull
+  public abstract net.corda.core.node.services.Vault$Page<T> vaultQuery(Class<? extends T>)
+  @RPCReturnsObservables
+  @NotNull
+  public abstract net.corda.core.node.services.Vault$Page<T> vaultQueryBy(net.corda.core.node.services.vault.QueryCriteria, net.corda.core.node.services.vault.PageSpecification, net.corda.core.node.services.vault.Sort, Class<? extends T>)
+  @NotNull
+  public abstract net.corda.core.node.services.Vault$Page<T> vaultQueryByCriteria(net.corda.core.node.services.vault.QueryCriteria, Class<? extends T>)
+  @NotNull
+  public abstract net.corda.core.node.services.Vault$Page<T> vaultQueryByWithPagingSpec(Class<? extends T>, net.corda.core.node.services.vault.QueryCriteria, net.corda.core.node.services.vault.PageSpecification)
+  @NotNull
+  public abstract net.corda.core.node.services.Vault$Page<T> vaultQueryByWithSorting(Class<? extends T>, net.corda.core.node.services.vault.QueryCriteria, net.corda.core.node.services.vault.Sort)
+  @NotNull
+  public abstract net.corda.core.messaging.DataFeed<net.corda.core.node.services.Vault$Page<T>, net.corda.core.node.services.Vault$Update<T>> vaultTrack(Class<? extends T>)
+  @RPCReturnsObservables
+  @NotNull
+  public abstract net.corda.core.messaging.DataFeed<net.corda.core.node.services.Vault$Page<T>, net.corda.core.node.services.Vault$Update<T>> vaultTrackBy(net.corda.core.node.services.vault.QueryCriteria, net.corda.core.node.services.vault.PageSpecification, net.corda.core.node.services.vault.Sort, Class<? extends T>)
+  @NotNull
+  public abstract net.corda.core.messaging.DataFeed<net.corda.core.node.services.Vault$Page<T>, net.corda.core.node.services.Vault$Update<T>> vaultTrackByCriteria(Class<? extends T>, net.corda.core.node.services.vault.QueryCriteria)
+  @NotNull
+  public abstract net.corda.core.messaging.DataFeed<net.corda.core.node.services.Vault$Page<T>, net.corda.core.node.services.Vault$Update<T>> vaultTrackByWithPagingSpec(Class<? extends T>, net.corda.core.node.services.vault.QueryCriteria, net.corda.core.node.services.vault.PageSpecification)
+  @NotNull
+  public abstract net.corda.core.messaging.DataFeed<net.corda.core.node.services.Vault$Page<T>, net.corda.core.node.services.Vault$Update<T>> vaultTrackByWithSorting(Class<? extends T>, net.corda.core.node.services.vault.QueryCriteria, net.corda.core.node.services.vault.Sort)
+  @RPCReturnsObservables
+  @NotNull
+  public abstract net.corda.core.concurrent.CordaFuture<Void> waitUntilNetworkReady()
+  @Nullable
+  public abstract net.corda.core.identity.Party wellKnownPartyFromAnonymous(net.corda.core.identity.AbstractParty)
+  @Nullable
+  public abstract net.corda.core.identity.Party wellKnownPartyFromX500Name(net.corda.core.identity.CordaX500Name)
 ##
 public final class net.corda.core.messaging.CordaRPCOpsKt extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.messaging.DataFeed pendingFlowsCount(net.corda.core.messaging.CordaRPCOps)
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.messaging.DataFeed extends java.lang.Object
-  public <init>(Object, rx.Observable)
-  public final Object component1()
-  @org.jetbrains.annotations.NotNull public final rx.Observable component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.messaging.DataFeed copy(Object, rx.Observable)
+@CordaSerializable
+public final class net.corda.core.messaging.DataFeed extends java.lang.Object
+  public <init>(A, rx.Observable<B>)
+  public final A component1()
+  @NotNull
+  public final rx.Observable<B> component2()
+  @NotNull
+  public final net.corda.core.messaging.DataFeed<A, B> copy(A, rx.Observable<B>)
   public boolean equals(Object)
-  public final Object getSnapshot()
-  @org.jetbrains.annotations.NotNull public final rx.Observable getUpdates()
+  public final A getSnapshot()
+  @NotNull
+  public final rx.Observable<B> getUpdates()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.DoNotImplement public interface net.corda.core.messaging.FlowHandle extends java.lang.AutoCloseable
+@DoNotImplement
+public interface net.corda.core.messaging.FlowHandle extends java.lang.AutoCloseable
   public abstract void close()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.flows.StateMachineRunId getId()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.concurrent.CordaFuture getReturnValue()
+  @NotNull
+  public abstract net.corda.core.flows.StateMachineRunId getId()
+  @NotNull
+  public abstract net.corda.core.concurrent.CordaFuture<A> getReturnValue()
 ##
-@net.corda.core.DoNotImplement @net.corda.core.serialization.CordaSerializable public final class net.corda.core.messaging.FlowHandleImpl extends java.lang.Object implements net.corda.core.messaging.FlowHandle
-  public <init>(net.corda.core.flows.StateMachineRunId, net.corda.core.concurrent.CordaFuture)
+@DoNotImplement
+@CordaSerializable
+public final class net.corda.core.messaging.FlowHandleImpl extends java.lang.Object implements net.corda.core.messaging.FlowHandle
+  public <init>(net.corda.core.flows.StateMachineRunId, net.corda.core.concurrent.CordaFuture<A>)
   public void close()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.StateMachineRunId component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.concurrent.CordaFuture component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.messaging.FlowHandleImpl copy(net.corda.core.flows.StateMachineRunId, net.corda.core.concurrent.CordaFuture)
+  @NotNull
+  public final net.corda.core.flows.StateMachineRunId component1()
+  @NotNull
+  public final net.corda.core.concurrent.CordaFuture<A> component2()
+  @NotNull
+  public final net.corda.core.messaging.FlowHandleImpl<A> copy(net.corda.core.flows.StateMachineRunId, net.corda.core.concurrent.CordaFuture<A>)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public net.corda.core.flows.StateMachineRunId getId()
-  @org.jetbrains.annotations.NotNull public net.corda.core.concurrent.CordaFuture getReturnValue()
+  @NotNull
+  public net.corda.core.flows.StateMachineRunId getId()
+  @NotNull
+  public net.corda.core.concurrent.CordaFuture<A> getReturnValue()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.DoNotImplement public interface net.corda.core.messaging.FlowProgressHandle extends net.corda.core.messaging.FlowHandle
+@DoNotImplement
+public interface net.corda.core.messaging.FlowProgressHandle extends net.corda.core.messaging.FlowHandle
   public abstract void close()
-  @org.jetbrains.annotations.NotNull public abstract rx.Observable getProgress()
-  @org.jetbrains.annotations.Nullable public abstract net.corda.core.messaging.DataFeed getStepsTreeFeed()
-  @org.jetbrains.annotations.Nullable public abstract net.corda.core.messaging.DataFeed getStepsTreeIndexFeed()
+  @NotNull
+  public abstract rx.Observable<String> getProgress()
+  @Nullable
+  public abstract net.corda.core.messaging.DataFeed<java.util.List<kotlin.Pair<Integer, String>>, java.util.List<kotlin.Pair<Integer, String>>> getStepsTreeFeed()
+  @Nullable
+  public abstract net.corda.core.messaging.DataFeed<Integer, Integer> getStepsTreeIndexFeed()
 ##
-@net.corda.core.DoNotImplement @net.corda.core.serialization.CordaSerializable public final class net.corda.core.messaging.FlowProgressHandleImpl extends java.lang.Object implements net.corda.core.messaging.FlowProgressHandle
-  public <init>(net.corda.core.flows.StateMachineRunId, net.corda.core.concurrent.CordaFuture, rx.Observable)
-  public <init>(net.corda.core.flows.StateMachineRunId, net.corda.core.concurrent.CordaFuture, rx.Observable, net.corda.core.messaging.DataFeed)
-  public <init>(net.corda.core.flows.StateMachineRunId, net.corda.core.concurrent.CordaFuture, rx.Observable, net.corda.core.messaging.DataFeed, net.corda.core.messaging.DataFeed)
+@DoNotImplement
+@CordaSerializable
+public final class net.corda.core.messaging.FlowProgressHandleImpl extends java.lang.Object implements net.corda.core.messaging.FlowProgressHandle
+  public <init>(net.corda.core.flows.StateMachineRunId, net.corda.core.concurrent.CordaFuture<A>, rx.Observable<String>)
+  public <init>(net.corda.core.flows.StateMachineRunId, net.corda.core.concurrent.CordaFuture<A>, rx.Observable<String>, net.corda.core.messaging.DataFeed<Integer, Integer>)
+  public <init>(net.corda.core.flows.StateMachineRunId, net.corda.core.concurrent.CordaFuture<A>, rx.Observable<String>, net.corda.core.messaging.DataFeed<Integer, Integer>, net.corda.core.messaging.DataFeed<? extends java.util.List<kotlin.Pair<Integer, String>>, java.util.List<kotlin.Pair<Integer, String>>>)
   public void close()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.StateMachineRunId component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.concurrent.CordaFuture component2()
-  @org.jetbrains.annotations.NotNull public final rx.Observable component3()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.messaging.DataFeed component4()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.messaging.DataFeed component5()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.messaging.FlowProgressHandleImpl copy(net.corda.core.flows.StateMachineRunId, net.corda.core.concurrent.CordaFuture, rx.Observable)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.messaging.FlowProgressHandleImpl copy(net.corda.core.flows.StateMachineRunId, net.corda.core.concurrent.CordaFuture, rx.Observable, net.corda.core.messaging.DataFeed, net.corda.core.messaging.DataFeed)
+  @NotNull
+  public final net.corda.core.flows.StateMachineRunId component1()
+  @NotNull
+  public final net.corda.core.concurrent.CordaFuture<A> component2()
+  @NotNull
+  public final rx.Observable<String> component3()
+  @Nullable
+  public final net.corda.core.messaging.DataFeed<Integer, Integer> component4()
+  @Nullable
+  public final net.corda.core.messaging.DataFeed<java.util.List<kotlin.Pair<Integer, String>>, java.util.List<kotlin.Pair<Integer, String>>> component5()
+  @NotNull
+  public final net.corda.core.messaging.FlowProgressHandleImpl<A> copy(net.corda.core.flows.StateMachineRunId, net.corda.core.concurrent.CordaFuture<A>, rx.Observable<String>)
+  @NotNull
+  public final net.corda.core.messaging.FlowProgressHandleImpl<A> copy(net.corda.core.flows.StateMachineRunId, net.corda.core.concurrent.CordaFuture<A>, rx.Observable<String>, net.corda.core.messaging.DataFeed<Integer, Integer>, net.corda.core.messaging.DataFeed<? extends java.util.List<kotlin.Pair<Integer, String>>, java.util.List<kotlin.Pair<Integer, String>>>)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public net.corda.core.flows.StateMachineRunId getId()
-  @org.jetbrains.annotations.NotNull public rx.Observable getProgress()
-  @org.jetbrains.annotations.NotNull public net.corda.core.concurrent.CordaFuture getReturnValue()
-  @org.jetbrains.annotations.Nullable public net.corda.core.messaging.DataFeed getStepsTreeFeed()
-  @org.jetbrains.annotations.Nullable public net.corda.core.messaging.DataFeed getStepsTreeIndexFeed()
+  @NotNull
+  public net.corda.core.flows.StateMachineRunId getId()
+  @NotNull
+  public rx.Observable<String> getProgress()
+  @NotNull
+  public net.corda.core.concurrent.CordaFuture<A> getReturnValue()
+  @Nullable
+  public net.corda.core.messaging.DataFeed<java.util.List<kotlin.Pair<Integer, String>>, java.util.List<kotlin.Pair<Integer, String>>> getStepsTreeFeed()
+  @Nullable
+  public net.corda.core.messaging.DataFeed<Integer, Integer> getStepsTreeIndexFeed()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public interface net.corda.core.messaging.MessageRecipientGroup extends net.corda.core.messaging.MessageRecipients
+@CordaSerializable
+public interface net.corda.core.messaging.MessageRecipientGroup extends net.corda.core.messaging.MessageRecipients
 ##
-@net.corda.core.serialization.CordaSerializable public interface net.corda.core.messaging.MessageRecipients
+@CordaSerializable
+public interface net.corda.core.messaging.MessageRecipients
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.messaging.ParametersUpdateInfo extends java.lang.Object
+@CordaSerializable
+public final class net.corda.core.messaging.ParametersUpdateInfo extends java.lang.Object
   public <init>(net.corda.core.crypto.SecureHash, net.corda.core.node.NetworkParameters, String, java.time.Instant)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.NetworkParameters component2()
-  @org.jetbrains.annotations.NotNull public final String component3()
-  @org.jetbrains.annotations.NotNull public final java.time.Instant component4()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.messaging.ParametersUpdateInfo copy(net.corda.core.crypto.SecureHash, net.corda.core.node.NetworkParameters, String, java.time.Instant)
+  @NotNull
+  public final net.corda.core.crypto.SecureHash component1()
+  @NotNull
+  public final net.corda.core.node.NetworkParameters component2()
+  @NotNull
+  public final String component3()
+  @NotNull
+  public final java.time.Instant component4()
+  @NotNull
+  public final net.corda.core.messaging.ParametersUpdateInfo copy(net.corda.core.crypto.SecureHash, net.corda.core.node.NetworkParameters, String, java.time.Instant)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final String getDescription()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash getHash()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.NetworkParameters getParameters()
-  @org.jetbrains.annotations.NotNull public final java.time.Instant getUpdateDeadline()
+  @NotNull
+  public final String getDescription()
+  @NotNull
+  public final net.corda.core.crypto.SecureHash getHash()
+  @NotNull
+  public final net.corda.core.node.NetworkParameters getParameters()
+  @NotNull
+  public final java.time.Instant getUpdateDeadline()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.DoNotImplement public interface net.corda.core.messaging.RPCOps
+@DoNotImplement
+public interface net.corda.core.messaging.RPCOps
   public abstract int getProtocolVersion()
 ##
 public @interface net.corda.core.messaging.RPCReturnsObservables
 ##
-@net.corda.core.serialization.CordaSerializable public interface net.corda.core.messaging.SingleMessageRecipient extends net.corda.core.messaging.MessageRecipients
+@CordaSerializable
+public interface net.corda.core.messaging.SingleMessageRecipient extends net.corda.core.messaging.MessageRecipients
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.messaging.StateMachineInfo extends java.lang.Object
-  public <init>(net.corda.core.flows.StateMachineRunId, String, net.corda.core.flows.FlowInitiator, net.corda.core.messaging.DataFeed)
-  public <init>(net.corda.core.flows.StateMachineRunId, String, net.corda.core.flows.FlowInitiator, net.corda.core.messaging.DataFeed, net.corda.core.context.InvocationContext)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.StateMachineRunId component1()
-  @org.jetbrains.annotations.NotNull public final String component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.FlowInitiator component3()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.messaging.DataFeed component4()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.context.InvocationContext component5()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.messaging.StateMachineInfo copy(net.corda.core.flows.StateMachineRunId, String, net.corda.core.flows.FlowInitiator, net.corda.core.messaging.DataFeed)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.messaging.StateMachineInfo copy(net.corda.core.flows.StateMachineRunId, String, net.corda.core.flows.FlowInitiator, net.corda.core.messaging.DataFeed, net.corda.core.context.InvocationContext)
+@CordaSerializable
+public final class net.corda.core.messaging.StateMachineInfo extends java.lang.Object
+  public <init>(net.corda.core.flows.StateMachineRunId, String, net.corda.core.flows.FlowInitiator, net.corda.core.messaging.DataFeed<String, String>)
+  public <init>(net.corda.core.flows.StateMachineRunId, String, net.corda.core.flows.FlowInitiator, net.corda.core.messaging.DataFeed<String, String>, net.corda.core.context.InvocationContext)
+  @NotNull
+  public final net.corda.core.flows.StateMachineRunId component1()
+  @NotNull
+  public final String component2()
+  @NotNull
+  public final net.corda.core.flows.FlowInitiator component3()
+  @Nullable
+  public final net.corda.core.messaging.DataFeed<String, String> component4()
+  @NotNull
+  public final net.corda.core.context.InvocationContext component5()
+  @NotNull
+  public final net.corda.core.messaging.StateMachineInfo copy(net.corda.core.flows.StateMachineRunId, String, net.corda.core.flows.FlowInitiator, net.corda.core.messaging.DataFeed<String, String>)
+  @NotNull
+  public final net.corda.core.messaging.StateMachineInfo copy(net.corda.core.flows.StateMachineRunId, String, net.corda.core.flows.FlowInitiator, net.corda.core.messaging.DataFeed<String, String>, net.corda.core.context.InvocationContext)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final String getFlowLogicClassName()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.StateMachineRunId getId()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.FlowInitiator getInitiator()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.context.InvocationContext getInvocationContext()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.messaging.DataFeed getProgressTrackerStepAndUpdates()
+  @NotNull
+  public final String getFlowLogicClassName()
+  @NotNull
+  public final net.corda.core.flows.StateMachineRunId getId()
+  @NotNull
+  public final net.corda.core.flows.FlowInitiator getInitiator()
+  @NotNull
+  public final net.corda.core.context.InvocationContext getInvocationContext()
+  @Nullable
+  public final net.corda.core.messaging.DataFeed<String, String> getProgressTrackerStepAndUpdates()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public String toString()
+  @NotNull
+  public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.messaging.StateMachineTransactionMapping extends java.lang.Object
+@CordaSerializable
+public final class net.corda.core.messaging.StateMachineTransactionMapping extends java.lang.Object
   public <init>(net.corda.core.flows.StateMachineRunId, net.corda.core.crypto.SecureHash)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.StateMachineRunId component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.messaging.StateMachineTransactionMapping copy(net.corda.core.flows.StateMachineRunId, net.corda.core.crypto.SecureHash)
+  @NotNull
+  public final net.corda.core.flows.StateMachineRunId component1()
+  @NotNull
+  public final net.corda.core.crypto.SecureHash component2()
+  @NotNull
+  public final net.corda.core.messaging.StateMachineTransactionMapping copy(net.corda.core.flows.StateMachineRunId, net.corda.core.crypto.SecureHash)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.StateMachineRunId getStateMachineRunId()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash getTransactionId()
+  @NotNull
+  public final net.corda.core.flows.StateMachineRunId getStateMachineRunId()
+  @NotNull
+  public final net.corda.core.crypto.SecureHash getTransactionId()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public abstract class net.corda.core.messaging.StateMachineUpdate extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.flows.StateMachineRunId getId()
+@CordaSerializable
+public abstract class net.corda.core.messaging.StateMachineUpdate extends java.lang.Object
+  @NotNull
+  public abstract net.corda.core.flows.StateMachineRunId getId()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.messaging.StateMachineUpdate$Added extends net.corda.core.messaging.StateMachineUpdate
+@CordaSerializable
+public static final class net.corda.core.messaging.StateMachineUpdate$Added extends net.corda.core.messaging.StateMachineUpdate
   public <init>(net.corda.core.messaging.StateMachineInfo)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.messaging.StateMachineInfo component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.messaging.StateMachineUpdate$Added copy(net.corda.core.messaging.StateMachineInfo)
+  @NotNull
+  public final net.corda.core.messaging.StateMachineInfo component1()
+  @NotNull
+  public final net.corda.core.messaging.StateMachineUpdate$Added copy(net.corda.core.messaging.StateMachineInfo)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public net.corda.core.flows.StateMachineRunId getId()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.messaging.StateMachineInfo getStateMachineInfo()
+  @NotNull
+  public net.corda.core.flows.StateMachineRunId getId()
+  @NotNull
+  public final net.corda.core.messaging.StateMachineInfo getStateMachineInfo()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.messaging.StateMachineUpdate$Removed extends net.corda.core.messaging.StateMachineUpdate
-  public <init>(net.corda.core.flows.StateMachineRunId, net.corda.core.utilities.Try)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.flows.StateMachineRunId component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.Try component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.messaging.StateMachineUpdate$Removed copy(net.corda.core.flows.StateMachineRunId, net.corda.core.utilities.Try)
+@CordaSerializable
+public static final class net.corda.core.messaging.StateMachineUpdate$Removed extends net.corda.core.messaging.StateMachineUpdate
+  public <init>(net.corda.core.flows.StateMachineRunId, net.corda.core.utilities.Try<?>)
+  @NotNull
+  public final net.corda.core.flows.StateMachineRunId component1()
+  @NotNull
+  public final net.corda.core.utilities.Try<?> component2()
+  @NotNull
+  public final net.corda.core.messaging.StateMachineUpdate$Removed copy(net.corda.core.flows.StateMachineRunId, net.corda.core.utilities.Try<?>)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public net.corda.core.flows.StateMachineRunId getId()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.Try getResult()
+  @NotNull
+  public net.corda.core.flows.StateMachineRunId getId()
+  @NotNull
+  public final net.corda.core.utilities.Try<?> getResult()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.DoNotImplement public interface net.corda.core.node.AppServiceHub extends net.corda.core.node.ServiceHub
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.messaging.FlowHandle startFlow(net.corda.core.flows.FlowLogic)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.messaging.FlowProgressHandle startTrackedFlow(net.corda.core.flows.FlowLogic)
+@DoNotImplement
+public interface net.corda.core.node.AppServiceHub extends net.corda.core.node.ServiceHub
+  @NotNull
+  public abstract net.corda.core.messaging.FlowHandle<T> startFlow(net.corda.core.flows.FlowLogic<? extends T>)
+  @NotNull
+  public abstract net.corda.core.messaging.FlowProgressHandle<T> startTrackedFlow(net.corda.core.flows.FlowLogic<? extends T>)
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.node.NetworkParameters extends java.lang.Object
-  public <init>(int, List, int, int, java.time.Instant, int, Map)
+@CordaSerializable
+public final class net.corda.core.node.NetworkParameters extends java.lang.Object
+  public <init>(int, java.util.List<net.corda.core.node.NotaryInfo>, int, int, java.time.Instant, int, java.util.Map<String, ? extends java.util.List<? extends net.corda.core.crypto.SecureHash>>)
   public final int component1()
-  @org.jetbrains.annotations.NotNull public final List component2()
+  @NotNull
+  public final java.util.List<net.corda.core.node.NotaryInfo> component2()
   public final int component3()
   public final int component4()
-  @org.jetbrains.annotations.NotNull public final java.time.Instant component5()
+  @NotNull
+  public final java.time.Instant component5()
   public final int component6()
-  @org.jetbrains.annotations.NotNull public final Map component7()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.NetworkParameters copy(int, List, int, int, java.time.Instant, int, Map)
+  @NotNull
+  public final java.util.Map<String, java.util.List<net.corda.core.crypto.SecureHash>> component7()
+  @NotNull
+  public final net.corda.core.node.NetworkParameters copy(int, java.util.List<net.corda.core.node.NotaryInfo>, int, int, java.time.Instant, int, java.util.Map<String, ? extends java.util.List<? extends net.corda.core.crypto.SecureHash>>)
   public boolean equals(Object)
   public final int getEpoch()
   public final int getMaxMessageSize()
   public final int getMaxTransactionSize()
   public final int getMinimumPlatformVersion()
-  @org.jetbrains.annotations.NotNull public final java.time.Instant getModifiedTime()
-  @org.jetbrains.annotations.NotNull public final List getNotaries()
-  @org.jetbrains.annotations.NotNull public final Map getWhitelistedContractImplementations()
+  @NotNull
+  public final java.time.Instant getModifiedTime()
+  @NotNull
+  public final java.util.List<net.corda.core.node.NotaryInfo> getNotaries()
+  @NotNull
+  public final java.util.Map<String, java.util.List<net.corda.core.crypto.SecureHash>> getWhitelistedContractImplementations()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public String toString()
+  public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.node.NodeInfo extends java.lang.Object
-  public <init>(List, List, int, long)
-  @org.jetbrains.annotations.NotNull public final List component1()
-  @org.jetbrains.annotations.NotNull public final List component2()
+@CordaSerializable
+public final class net.corda.core.node.NodeInfo extends java.lang.Object
+  public <init>(java.util.List<net.corda.core.utilities.NetworkHostAndPort>, java.util.List<net.corda.core.identity.PartyAndCertificate>, int, long)
+  @NotNull
+  public final java.util.List<net.corda.core.utilities.NetworkHostAndPort> component1()
+  @NotNull
+  public final java.util.List<net.corda.core.identity.PartyAndCertificate> component2()
   public final int component3()
   public final long component4()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.NodeInfo copy(List, List, int, long)
+  @NotNull
+  public final net.corda.core.node.NodeInfo copy(java.util.List<net.corda.core.utilities.NetworkHostAndPort>, java.util.List<net.corda.core.identity.PartyAndCertificate>, int, long)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final List getAddresses()
-  @org.jetbrains.annotations.NotNull public final List getLegalIdentities()
-  @org.jetbrains.annotations.NotNull public final List getLegalIdentitiesAndCerts()
+  @NotNull
+  public final java.util.List<net.corda.core.utilities.NetworkHostAndPort> getAddresses()
+  @NotNull
+  public final java.util.List<net.corda.core.identity.Party> getLegalIdentities()
+  @NotNull
+  public final java.util.List<net.corda.core.identity.PartyAndCertificate> getLegalIdentitiesAndCerts()
   public final int getPlatformVersion()
   public final long getSerial()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.PartyAndCertificate identityAndCertFromX500Name(net.corda.core.identity.CordaX500Name)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.Party identityFromX500Name(net.corda.core.identity.CordaX500Name)
+  @NotNull
+  public final net.corda.core.identity.PartyAndCertificate identityAndCertFromX500Name(net.corda.core.identity.CordaX500Name)
+  @NotNull
+  public final net.corda.core.identity.Party identityFromX500Name(net.corda.core.identity.CordaX500Name)
   public final boolean isLegalIdentity(net.corda.core.identity.Party)
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.node.NotaryInfo extends java.lang.Object
+@CordaSerializable
+public final class net.corda.core.node.NotaryInfo extends java.lang.Object
   public <init>(net.corda.core.identity.Party, boolean)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.Party component1()
+  @NotNull
+  public final net.corda.core.identity.Party component1()
   public final boolean component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.NotaryInfo copy(net.corda.core.identity.Party, boolean)
+  @NotNull
+  public final net.corda.core.node.NotaryInfo copy(net.corda.core.identity.Party, boolean)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.Party getIdentity()
+  @NotNull
+  public final net.corda.core.identity.Party getIdentity()
   public final boolean getValidating()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.DoNotImplement public interface net.corda.core.node.ServiceHub extends net.corda.core.node.ServicesForResolution
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.transactions.SignedTransaction addSignature(net.corda.core.transactions.SignedTransaction)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.transactions.SignedTransaction addSignature(net.corda.core.transactions.SignedTransaction, java.security.PublicKey)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.serialization.SerializeAsToken cordaService(Class)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.crypto.TransactionSignature createSignature(net.corda.core.transactions.FilteredTransaction)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.crypto.TransactionSignature createSignature(net.corda.core.transactions.FilteredTransaction, java.security.PublicKey)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.crypto.TransactionSignature createSignature(net.corda.core.transactions.SignedTransaction)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.crypto.TransactionSignature createSignature(net.corda.core.transactions.SignedTransaction, java.security.PublicKey)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.cordapp.CordappContext getAppContext()
-  @org.jetbrains.annotations.NotNull public abstract java.time.Clock getClock()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.node.services.ContractUpgradeService getContractUpgradeService()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.node.services.KeyManagementService getKeyManagementService()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.node.NodeInfo getMyInfo()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.node.services.NetworkMapCache getNetworkMapCache()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.node.services.TransactionVerifierService getTransactionVerifierService()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.node.services.TransactionStorage getValidatedTransactions()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.node.services.VaultService getVaultService()
-  @org.jetbrains.annotations.NotNull public abstract java.sql.Connection jdbcSession()
-  public abstract void recordTransactions(Iterable)
-  public abstract void recordTransactions(net.corda.core.node.StatesToRecord, Iterable)
+@DoNotImplement
+public interface net.corda.core.node.ServiceHub extends net.corda.core.node.ServicesForResolution
+  @NotNull
+  public abstract net.corda.core.transactions.SignedTransaction addSignature(net.corda.core.transactions.SignedTransaction)
+  @NotNull
+  public abstract net.corda.core.transactions.SignedTransaction addSignature(net.corda.core.transactions.SignedTransaction, java.security.PublicKey)
+  @NotNull
+  public abstract T cordaService(Class<T>)
+  @NotNull
+  public abstract net.corda.core.crypto.TransactionSignature createSignature(net.corda.core.transactions.FilteredTransaction)
+  @NotNull
+  public abstract net.corda.core.crypto.TransactionSignature createSignature(net.corda.core.transactions.FilteredTransaction, java.security.PublicKey)
+  @NotNull
+  public abstract net.corda.core.crypto.TransactionSignature createSignature(net.corda.core.transactions.SignedTransaction)
+  @NotNull
+  public abstract net.corda.core.crypto.TransactionSignature createSignature(net.corda.core.transactions.SignedTransaction, java.security.PublicKey)
+  @NotNull
+  public abstract java.time.Clock getClock()
+  @NotNull
+  public abstract net.corda.core.node.services.ContractUpgradeService getContractUpgradeService()
+  @NotNull
+  public abstract net.corda.core.node.services.KeyManagementService getKeyManagementService()
+  @NotNull
+  public abstract net.corda.core.node.NodeInfo getMyInfo()
+  @NotNull
+  public abstract net.corda.core.node.services.NetworkMapCache getNetworkMapCache()
+  @NotNull
+  public abstract net.corda.core.node.services.TransactionVerifierService getTransactionVerifierService()
+  @NotNull
+  public abstract net.corda.core.node.services.TransactionStorage getValidatedTransactions()
+  @NotNull
+  public abstract net.corda.core.node.services.VaultService getVaultService()
+  @NotNull
+  public abstract java.sql.Connection jdbcSession()
+  public abstract void recordTransactions(Iterable<net.corda.core.transactions.SignedTransaction>)
+  public abstract void recordTransactions(net.corda.core.node.StatesToRecord, Iterable<net.corda.core.transactions.SignedTransaction>)
   public abstract void recordTransactions(net.corda.core.transactions.SignedTransaction, net.corda.core.transactions.SignedTransaction...)
-  public abstract void recordTransactions(boolean, Iterable)
+  public abstract void recordTransactions(boolean, Iterable<net.corda.core.transactions.SignedTransaction>)
   public abstract void recordTransactions(boolean, net.corda.core.transactions.SignedTransaction, net.corda.core.transactions.SignedTransaction...)
-  public abstract void registerUnloadHandler(kotlin.jvm.functions.Function0)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.transactions.SignedTransaction signInitialTransaction(net.corda.core.transactions.TransactionBuilder)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.transactions.SignedTransaction signInitialTransaction(net.corda.core.transactions.TransactionBuilder, Iterable)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.transactions.SignedTransaction signInitialTransaction(net.corda.core.transactions.TransactionBuilder, java.security.PublicKey)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.contracts.StateAndRef toStateAndRef(net.corda.core.contracts.StateRef)
+  public abstract void registerUnloadHandler(kotlin.jvm.functions.Function0<kotlin.Unit>)
+  @NotNull
+  public abstract net.corda.core.transactions.SignedTransaction signInitialTransaction(net.corda.core.transactions.TransactionBuilder)
+  @NotNull
+  public abstract net.corda.core.transactions.SignedTransaction signInitialTransaction(net.corda.core.transactions.TransactionBuilder, Iterable<? extends java.security.PublicKey>)
+  @NotNull
+  public abstract net.corda.core.transactions.SignedTransaction signInitialTransaction(net.corda.core.transactions.TransactionBuilder, java.security.PublicKey)
+  @NotNull
+  public abstract net.corda.core.contracts.StateAndRef<T> toStateAndRef(net.corda.core.contracts.StateRef)
 ##
-@net.corda.core.DoNotImplement public interface net.corda.core.node.ServicesForResolution
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.node.services.AttachmentStorage getAttachments()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.cordapp.CordappProvider getCordappProvider()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.node.services.IdentityService getIdentityService()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.node.NetworkParameters getNetworkParameters()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.contracts.TransactionState loadState(net.corda.core.contracts.StateRef)
-  @org.jetbrains.annotations.NotNull public abstract Set loadStates(Set)
+@DoNotImplement
+public interface net.corda.core.node.ServicesForResolution
+  @NotNull
+  public abstract net.corda.core.node.services.AttachmentStorage getAttachments()
+  @NotNull
+  public abstract net.corda.core.cordapp.CordappProvider getCordappProvider()
+  @NotNull
+  public abstract net.corda.core.node.services.IdentityService getIdentityService()
+  @NotNull
+  public abstract net.corda.core.node.NetworkParameters getNetworkParameters()
+  @NotNull
+  public abstract net.corda.core.contracts.TransactionState<?> loadState(net.corda.core.contracts.StateRef)
+  @NotNull
+  public abstract java.util.Set<net.corda.core.contracts.StateAndRef<net.corda.core.contracts.ContractState>> loadStates(java.util.Set<net.corda.core.contracts.StateRef>)
 ##
 public final class net.corda.core.node.StatesToRecord extends java.lang.Enum
-  protected <init>(String, int)
+  protected <init>()
   public static net.corda.core.node.StatesToRecord valueOf(String)
   public static net.corda.core.node.StatesToRecord[] values()
 ##
-@net.corda.core.DoNotImplement public interface net.corda.core.node.services.AttachmentStorage
+@DoNotImplement
+public interface net.corda.core.node.services.AttachmentStorage
   public abstract boolean hasAttachment(net.corda.core.crypto.SecureHash)
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public abstract net.corda.core.crypto.SecureHash importAttachment(java.io.InputStream)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.crypto.SecureHash importAttachment(java.io.InputStream, String, String)
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public abstract net.corda.core.crypto.SecureHash importOrGetAttachment(java.io.InputStream)
-  @org.jetbrains.annotations.Nullable public abstract net.corda.core.contracts.Attachment openAttachment(net.corda.core.crypto.SecureHash)
-  @org.jetbrains.annotations.NotNull public abstract List queryAttachments(net.corda.core.node.services.vault.AttachmentQueryCriteria, net.corda.core.node.services.vault.AttachmentSort)
+  @NotNull
+  public abstract net.corda.core.crypto.SecureHash importAttachment(java.io.InputStream)
+  @NotNull
+  public abstract net.corda.core.crypto.SecureHash importAttachment(java.io.InputStream, String, String)
+  @NotNull
+  public abstract net.corda.core.crypto.SecureHash importOrGetAttachment(java.io.InputStream)
+  @Nullable
+  public abstract net.corda.core.contracts.Attachment openAttachment(net.corda.core.crypto.SecureHash)
+  @NotNull
+  public abstract java.util.List<net.corda.core.crypto.SecureHash> queryAttachments(net.corda.core.node.services.vault.AttachmentQueryCriteria, net.corda.core.node.services.vault.AttachmentSort)
 ##
 public final class net.corda.core.node.services.AttachmentStorageKt extends java.lang.Object
 ##
-@net.corda.core.DoNotImplement public interface net.corda.core.node.services.ContractUpgradeService
-  @org.jetbrains.annotations.Nullable public abstract String getAuthorisedContractUpgrade(net.corda.core.contracts.StateRef)
+@DoNotImplement
+public interface net.corda.core.node.services.ContractUpgradeService
+  @Nullable
+  public abstract String getAuthorisedContractUpgrade(net.corda.core.contracts.StateRef)
   public abstract void removeAuthorisedContractUpgrade(net.corda.core.contracts.StateRef)
-  public abstract void storeAuthorisedContractUpgrade(net.corda.core.contracts.StateRef, Class)
+  public abstract void storeAuthorisedContractUpgrade(net.corda.core.contracts.StateRef, Class<? extends net.corda.core.contracts.UpgradedContract<?, ?>>)
 ##
 public @interface net.corda.core.node.services.CordaService
 ##
-@net.corda.core.DoNotImplement public interface net.corda.core.node.services.IdentityService
+@DoNotImplement
+public interface net.corda.core.node.services.IdentityService
   public abstract void assertOwnership(net.corda.core.identity.Party, net.corda.core.identity.AnonymousParty)
-  @org.jetbrains.annotations.Nullable public abstract net.corda.core.identity.PartyAndCertificate certificateFromKey(java.security.PublicKey)
-  @org.jetbrains.annotations.NotNull public abstract Iterable getAllIdentities()
-  @org.jetbrains.annotations.NotNull public abstract java.security.cert.CertStore getCaCertStore()
-  @org.jetbrains.annotations.NotNull public abstract java.security.cert.TrustAnchor getTrustAnchor()
-  @org.jetbrains.annotations.NotNull public abstract java.security.cert.X509Certificate getTrustRoot()
-  @org.jetbrains.annotations.NotNull public abstract Set partiesFromName(String, boolean)
-  @org.jetbrains.annotations.Nullable public abstract net.corda.core.identity.Party partyFromKey(java.security.PublicKey)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.identity.Party requireWellKnownPartyFromAnonymous(net.corda.core.identity.AbstractParty)
-  @org.jetbrains.annotations.Nullable public abstract net.corda.core.identity.PartyAndCertificate verifyAndRegisterIdentity(net.corda.core.identity.PartyAndCertificate)
-  @org.jetbrains.annotations.Nullable public abstract net.corda.core.identity.Party wellKnownPartyFromAnonymous(net.corda.core.contracts.PartyAndReference)
-  @org.jetbrains.annotations.Nullable public abstract net.corda.core.identity.Party wellKnownPartyFromAnonymous(net.corda.core.identity.AbstractParty)
-  @org.jetbrains.annotations.Nullable public abstract net.corda.core.identity.Party wellKnownPartyFromX500Name(net.corda.core.identity.CordaX500Name)
+  @Nullable
+  public abstract net.corda.core.identity.PartyAndCertificate certificateFromKey(java.security.PublicKey)
+  @NotNull
+  public abstract Iterable<net.corda.core.identity.PartyAndCertificate> getAllIdentities()
+  @NotNull
+  public abstract java.security.cert.CertStore getCaCertStore()
+  @NotNull
+  public abstract java.security.cert.TrustAnchor getTrustAnchor()
+  @NotNull
+  public abstract java.security.cert.X509Certificate getTrustRoot()
+  @NotNull
+  public abstract java.util.Set<net.corda.core.identity.Party> partiesFromName(String, boolean)
+  @Nullable
+  public abstract net.corda.core.identity.Party partyFromKey(java.security.PublicKey)
+  @NotNull
+  public abstract net.corda.core.identity.Party requireWellKnownPartyFromAnonymous(net.corda.core.identity.AbstractParty)
+  @Nullable
+  public abstract net.corda.core.identity.PartyAndCertificate verifyAndRegisterIdentity(net.corda.core.identity.PartyAndCertificate)
+  @Nullable
+  public abstract net.corda.core.identity.Party wellKnownPartyFromAnonymous(net.corda.core.contracts.PartyAndReference)
+  @Nullable
+  public abstract net.corda.core.identity.Party wellKnownPartyFromAnonymous(net.corda.core.identity.AbstractParty)
+  @Nullable
+  public abstract net.corda.core.identity.Party wellKnownPartyFromX500Name(net.corda.core.identity.CordaX500Name)
 ##
-@net.corda.core.DoNotImplement public interface net.corda.core.node.services.KeyManagementService
-  @org.jetbrains.annotations.NotNull public abstract Iterable filterMyKeys(Iterable)
-  @co.paralleluniverse.fibers.Suspendable @org.jetbrains.annotations.NotNull public abstract java.security.PublicKey freshKey()
-  @co.paralleluniverse.fibers.Suspendable @org.jetbrains.annotations.NotNull public abstract net.corda.core.identity.PartyAndCertificate freshKeyAndCert(net.corda.core.identity.PartyAndCertificate, boolean)
-  @org.jetbrains.annotations.NotNull public abstract Set getKeys()
-  @co.paralleluniverse.fibers.Suspendable @org.jetbrains.annotations.NotNull public abstract net.corda.core.crypto.TransactionSignature sign(net.corda.core.crypto.SignableData, java.security.PublicKey)
-  @co.paralleluniverse.fibers.Suspendable @org.jetbrains.annotations.NotNull public abstract net.corda.core.crypto.DigitalSignature$WithKey sign(byte[], java.security.PublicKey)
+@DoNotImplement
+public interface net.corda.core.node.services.KeyManagementService
+  @NotNull
+  public abstract Iterable<java.security.PublicKey> filterMyKeys(Iterable<? extends java.security.PublicKey>)
+  @Suspendable
+  @NotNull
+  public abstract java.security.PublicKey freshKey()
+  @Suspendable
+  @NotNull
+  public abstract net.corda.core.identity.PartyAndCertificate freshKeyAndCert(net.corda.core.identity.PartyAndCertificate, boolean)
+  @NotNull
+  public abstract java.util.Set<java.security.PublicKey> getKeys()
+  @Suspendable
+  @NotNull
+  public abstract net.corda.core.crypto.TransactionSignature sign(net.corda.core.crypto.SignableData, java.security.PublicKey)
+  @Suspendable
+  @NotNull
+  public abstract net.corda.core.crypto.DigitalSignature$WithKey sign(byte[], java.security.PublicKey)
 ##
-@net.corda.core.DoNotImplement public interface net.corda.core.node.services.NetworkMapCache extends net.corda.core.node.services.NetworkMapCacheBase
-  @org.jetbrains.annotations.Nullable public abstract net.corda.core.node.NodeInfo getNodeByLegalIdentity(net.corda.core.identity.AbstractParty)
+@DoNotImplement
+public interface net.corda.core.node.services.NetworkMapCache extends net.corda.core.node.services.NetworkMapCacheBase
+  @Nullable
+  public abstract net.corda.core.node.NodeInfo getNodeByLegalIdentity(net.corda.core.identity.AbstractParty)
 ##
-@net.corda.core.serialization.CordaSerializable public abstract static class net.corda.core.node.services.NetworkMapCache$MapChange extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.node.NodeInfo getNode()
+@CordaSerializable
+public abstract static class net.corda.core.node.services.NetworkMapCache$MapChange extends java.lang.Object
+  @NotNull
+  public abstract net.corda.core.node.NodeInfo getNode()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.NetworkMapCache$MapChange$Added extends net.corda.core.node.services.NetworkMapCache$MapChange
+@CordaSerializable
+public static final class net.corda.core.node.services.NetworkMapCache$MapChange$Added extends net.corda.core.node.services.NetworkMapCache$MapChange
   public <init>(net.corda.core.node.NodeInfo)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.NodeInfo component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.NetworkMapCache$MapChange$Added copy(net.corda.core.node.NodeInfo)
+  @NotNull
+  public final net.corda.core.node.NodeInfo component1()
+  @NotNull
+  public final net.corda.core.node.services.NetworkMapCache$MapChange$Added copy(net.corda.core.node.NodeInfo)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.NodeInfo getNode()
+  @NotNull
+  public net.corda.core.node.NodeInfo getNode()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.NetworkMapCache$MapChange$Modified extends net.corda.core.node.services.NetworkMapCache$MapChange
+@CordaSerializable
+public static final class net.corda.core.node.services.NetworkMapCache$MapChange$Modified extends net.corda.core.node.services.NetworkMapCache$MapChange
   public <init>(net.corda.core.node.NodeInfo, net.corda.core.node.NodeInfo)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.NodeInfo component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.NodeInfo component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.NetworkMapCache$MapChange$Modified copy(net.corda.core.node.NodeInfo, net.corda.core.node.NodeInfo)
+  @NotNull
+  public final net.corda.core.node.NodeInfo component1()
+  @NotNull
+  public final net.corda.core.node.NodeInfo component2()
+  @NotNull
+  public final net.corda.core.node.services.NetworkMapCache$MapChange$Modified copy(net.corda.core.node.NodeInfo, net.corda.core.node.NodeInfo)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.NodeInfo getNode()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.NodeInfo getPreviousNode()
+  @NotNull
+  public net.corda.core.node.NodeInfo getNode()
+  @NotNull
+  public final net.corda.core.node.NodeInfo getPreviousNode()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.NetworkMapCache$MapChange$Removed extends net.corda.core.node.services.NetworkMapCache$MapChange
+@CordaSerializable
+public static final class net.corda.core.node.services.NetworkMapCache$MapChange$Removed extends net.corda.core.node.services.NetworkMapCache$MapChange
   public <init>(net.corda.core.node.NodeInfo)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.NodeInfo component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.NetworkMapCache$MapChange$Removed copy(net.corda.core.node.NodeInfo)
+  @NotNull
+  public final net.corda.core.node.NodeInfo component1()
+  @NotNull
+  public final net.corda.core.node.services.NetworkMapCache$MapChange$Removed copy(net.corda.core.node.NodeInfo)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.NodeInfo getNode()
+  @NotNull
+  public net.corda.core.node.NodeInfo getNode()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.DoNotImplement public interface net.corda.core.node.services.NetworkMapCacheBase
+@DoNotImplement
+public interface net.corda.core.node.services.NetworkMapCacheBase
   public abstract void clearNetworkMapCache()
-  @org.jetbrains.annotations.NotNull public abstract List getAllNodes()
-  @org.jetbrains.annotations.NotNull public abstract rx.Observable getChanged()
-  @org.jetbrains.annotations.Nullable public abstract net.corda.core.node.NodeInfo getNodeByAddress(net.corda.core.utilities.NetworkHostAndPort)
-  @org.jetbrains.annotations.Nullable public abstract net.corda.core.node.NodeInfo getNodeByLegalName(net.corda.core.identity.CordaX500Name)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.concurrent.CordaFuture getNodeReady()
-  @org.jetbrains.annotations.NotNull public abstract List getNodesByLegalIdentityKey(java.security.PublicKey)
-  @org.jetbrains.annotations.NotNull public abstract List getNodesByLegalName(net.corda.core.identity.CordaX500Name)
-  @org.jetbrains.annotations.Nullable public abstract net.corda.core.identity.Party getNotary(net.corda.core.identity.CordaX500Name)
-  @org.jetbrains.annotations.NotNull public abstract List getNotaryIdentities()
-  @org.jetbrains.annotations.Nullable public abstract net.corda.core.node.services.PartyInfo getPartyInfo(net.corda.core.identity.Party)
-  @org.jetbrains.annotations.Nullable public abstract net.corda.core.identity.Party getPeerByLegalName(net.corda.core.identity.CordaX500Name)
-  @org.jetbrains.annotations.Nullable public abstract net.corda.core.identity.PartyAndCertificate getPeerCertificateByLegalName(net.corda.core.identity.CordaX500Name)
+  @NotNull
+  public abstract java.util.List<net.corda.core.node.NodeInfo> getAllNodes()
+  @NotNull
+  public abstract rx.Observable<net.corda.core.node.services.NetworkMapCache$MapChange> getChanged()
+  @Nullable
+  public abstract net.corda.core.node.NodeInfo getNodeByAddress(net.corda.core.utilities.NetworkHostAndPort)
+  @Nullable
+  public abstract net.corda.core.node.NodeInfo getNodeByLegalName(net.corda.core.identity.CordaX500Name)
+  @NotNull
+  public abstract net.corda.core.concurrent.CordaFuture<Void> getNodeReady()
+  @NotNull
+  public abstract java.util.List<net.corda.core.node.NodeInfo> getNodesByLegalIdentityKey(java.security.PublicKey)
+  @NotNull
+  public abstract java.util.List<net.corda.core.node.NodeInfo> getNodesByLegalName(net.corda.core.identity.CordaX500Name)
+  @Nullable
+  public abstract net.corda.core.identity.Party getNotary(net.corda.core.identity.CordaX500Name)
+  @NotNull
+  public abstract java.util.List<net.corda.core.identity.Party> getNotaryIdentities()
+  @Nullable
+  public abstract net.corda.core.node.services.PartyInfo getPartyInfo(net.corda.core.identity.Party)
+  @Nullable
+  public abstract net.corda.core.identity.Party getPeerByLegalName(net.corda.core.identity.CordaX500Name)
+  @Nullable
+  public abstract net.corda.core.identity.PartyAndCertificate getPeerCertificateByLegalName(net.corda.core.identity.CordaX500Name)
   public abstract boolean isNotary(net.corda.core.identity.Party)
   public abstract boolean isValidatingNotary(net.corda.core.identity.Party)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.messaging.DataFeed track()
+  @NotNull
+  public abstract net.corda.core.messaging.DataFeed<java.util.List<net.corda.core.node.NodeInfo>, net.corda.core.node.services.NetworkMapCache$MapChange> track()
 ##
 public abstract class net.corda.core.node.services.PartyInfo extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.identity.Party getParty()
+  @NotNull
+  public abstract net.corda.core.identity.Party getParty()
 ##
 public static final class net.corda.core.node.services.PartyInfo$DistributedNode extends net.corda.core.node.services.PartyInfo
   public <init>(net.corda.core.identity.Party)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.Party component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.PartyInfo$DistributedNode copy(net.corda.core.identity.Party)
+  @NotNull
+  public final net.corda.core.identity.Party component1()
+  @NotNull
+  public final net.corda.core.node.services.PartyInfo$DistributedNode copy(net.corda.core.identity.Party)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public net.corda.core.identity.Party getParty()
+  @NotNull
+  public net.corda.core.identity.Party getParty()
   public int hashCode()
   public String toString()
 ##
 public static final class net.corda.core.node.services.PartyInfo$SingleNode extends net.corda.core.node.services.PartyInfo
-  public <init>(net.corda.core.identity.Party, List)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.Party component1()
-  @org.jetbrains.annotations.NotNull public final List component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.PartyInfo$SingleNode copy(net.corda.core.identity.Party, List)
+  public <init>(net.corda.core.identity.Party, java.util.List<net.corda.core.utilities.NetworkHostAndPort>)
+  @NotNull
+  public final net.corda.core.identity.Party component1()
+  @NotNull
+  public final java.util.List<net.corda.core.utilities.NetworkHostAndPort> component2()
+  @NotNull
+  public final net.corda.core.node.services.PartyInfo$SingleNode copy(net.corda.core.identity.Party, java.util.List<net.corda.core.utilities.NetworkHostAndPort>)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final List getAddresses()
-  @org.jetbrains.annotations.NotNull public net.corda.core.identity.Party getParty()
+  @NotNull
+  public final java.util.List<net.corda.core.utilities.NetworkHostAndPort> getAddresses()
+  @NotNull
+  public net.corda.core.identity.Party getParty()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.node.services.StatesNotAvailableException extends net.corda.core.flows.FlowException
+@CordaSerializable
+public final class net.corda.core.node.services.StatesNotAvailableException extends net.corda.core.flows.FlowException
   public <init>(String, Throwable)
-  @org.jetbrains.annotations.Nullable public Throwable getCause()
-  @org.jetbrains.annotations.Nullable public String getMessage()
-  @org.jetbrains.annotations.NotNull public String toString()
+  @Nullable
+  public Throwable getCause()
+  @Nullable
+  public String getMessage()
+  @NotNull
+  public String toString()
 ##
 public final class net.corda.core.node.services.TimeWindowChecker extends java.lang.Object
   public <init>()
   public <init>(java.time.Clock)
-  @org.jetbrains.annotations.NotNull public final java.time.Clock getClock()
+  @NotNull
+  public final java.time.Clock getClock()
   public final boolean isValid(net.corda.core.contracts.TimeWindow)
 ##
-@net.corda.core.DoNotImplement public interface net.corda.core.node.services.TransactionStorage
-  @org.jetbrains.annotations.Nullable public abstract net.corda.core.transactions.SignedTransaction getTransaction(net.corda.core.crypto.SecureHash)
-  @org.jetbrains.annotations.NotNull public abstract rx.Observable getUpdates()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.messaging.DataFeed track()
+@DoNotImplement
+public interface net.corda.core.node.services.TransactionStorage
+  @Nullable
+  public abstract net.corda.core.transactions.SignedTransaction getTransaction(net.corda.core.crypto.SecureHash)
+  @NotNull
+  public abstract rx.Observable<net.corda.core.transactions.SignedTransaction> getUpdates()
+  @NotNull
+  public abstract net.corda.core.messaging.DataFeed<java.util.List<net.corda.core.transactions.SignedTransaction>, net.corda.core.transactions.SignedTransaction> track()
 ##
-@net.corda.core.DoNotImplement public interface net.corda.core.node.services.TransactionVerifierService
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.concurrent.CordaFuture verify(net.corda.core.transactions.LedgerTransaction)
+@DoNotImplement
+public interface net.corda.core.node.services.TransactionVerifierService
+  @NotNull
+  public abstract net.corda.core.concurrent.CordaFuture<?> verify(net.corda.core.transactions.LedgerTransaction)
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.node.services.UnknownAnonymousPartyException extends net.corda.core.CordaException
+@CordaSerializable
+public final class net.corda.core.node.services.UnknownAnonymousPartyException extends net.corda.core.CordaException
   public <init>(String)
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.node.services.Vault extends java.lang.Object
-  public <init>(Iterable)
-  @org.jetbrains.annotations.NotNull public final Iterable getStates()
+@CordaSerializable
+public final class net.corda.core.node.services.Vault extends java.lang.Object
+  public <init>(Iterable<? extends net.corda.core.contracts.StateAndRef<? extends T>>)
+  @NotNull
+  public final Iterable<net.corda.core.contracts.StateAndRef<T>> getStates()
   public static final net.corda.core.node.services.Vault$Companion Companion
 ##
 public static final class net.corda.core.node.services.Vault$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.Vault$Update getNoNotaryUpdate()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.Vault$Update getNoUpdate()
+  @NotNull
+  public final net.corda.core.node.services.Vault$Update<net.corda.core.contracts.ContractState> getNoNotaryUpdate()
+  @NotNull
+  public final net.corda.core.node.services.Vault$Update<net.corda.core.contracts.ContractState> getNoUpdate()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.Vault$Page extends java.lang.Object
-  public <init>(List, List, long, net.corda.core.node.services.Vault$StateStatus, List)
-  @org.jetbrains.annotations.NotNull public final List component1()
-  @org.jetbrains.annotations.NotNull public final List component2()
+@CordaSerializable
+public static final class net.corda.core.node.services.Vault$Page extends java.lang.Object
+  public <init>(java.util.List<? extends net.corda.core.contracts.StateAndRef<? extends T>>, java.util.List<net.corda.core.node.services.Vault$StateMetadata>, long, net.corda.core.node.services.Vault$StateStatus, java.util.List<?>)
+  @NotNull
+  public final java.util.List<net.corda.core.contracts.StateAndRef<T>> component1()
+  @NotNull
+  public final java.util.List<net.corda.core.node.services.Vault$StateMetadata> component2()
   public final long component3()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.Vault$StateStatus component4()
-  @org.jetbrains.annotations.NotNull public final List component5()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.Vault$Page copy(List, List, long, net.corda.core.node.services.Vault$StateStatus, List)
+  @NotNull
+  public final net.corda.core.node.services.Vault$StateStatus component4()
+  @NotNull
+  public final java.util.List<Object> component5()
+  @NotNull
+  public final net.corda.core.node.services.Vault$Page<T> copy(java.util.List<? extends net.corda.core.contracts.StateAndRef<? extends T>>, java.util.List<net.corda.core.node.services.Vault$StateMetadata>, long, net.corda.core.node.services.Vault$StateStatus, java.util.List<?>)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final List getOtherResults()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.Vault$StateStatus getStateTypes()
-  @org.jetbrains.annotations.NotNull public final List getStates()
-  @org.jetbrains.annotations.NotNull public final List getStatesMetadata()
+  @NotNull
+  public final java.util.List<Object> getOtherResults()
+  @NotNull
+  public final net.corda.core.node.services.Vault$StateStatus getStateTypes()
+  @NotNull
+  public final java.util.List<net.corda.core.contracts.StateAndRef<T>> getStates()
+  @NotNull
+  public final java.util.List<net.corda.core.node.services.Vault$StateMetadata> getStatesMetadata()
   public final long getTotalStatesAvailable()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.Vault$StateMetadata extends java.lang.Object
+@CordaSerializable
+public static final class net.corda.core.node.services.Vault$StateMetadata extends java.lang.Object
   public <init>(net.corda.core.contracts.StateRef, String, java.time.Instant, java.time.Instant, net.corda.core.node.services.Vault$StateStatus, net.corda.core.identity.AbstractParty, String, java.time.Instant)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.StateRef component1()
-  @org.jetbrains.annotations.NotNull public final String component2()
-  @org.jetbrains.annotations.NotNull public final java.time.Instant component3()
-  @org.jetbrains.annotations.Nullable public final java.time.Instant component4()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.Vault$StateStatus component5()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.identity.AbstractParty component6()
-  @org.jetbrains.annotations.Nullable public final String component7()
-  @org.jetbrains.annotations.Nullable public final java.time.Instant component8()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.Vault$StateMetadata copy(net.corda.core.contracts.StateRef, String, java.time.Instant, java.time.Instant, net.corda.core.node.services.Vault$StateStatus, net.corda.core.identity.AbstractParty, String, java.time.Instant)
+  @NotNull
+  public final net.corda.core.contracts.StateRef component1()
+  @NotNull
+  public final String component2()
+  @NotNull
+  public final java.time.Instant component3()
+  @Nullable
+  public final java.time.Instant component4()
+  @NotNull
+  public final net.corda.core.node.services.Vault$StateStatus component5()
+  @Nullable
+  public final net.corda.core.identity.AbstractParty component6()
+  @Nullable
+  public final String component7()
+  @Nullable
+  public final java.time.Instant component8()
+  @NotNull
+  public final net.corda.core.node.services.Vault$StateMetadata copy(net.corda.core.contracts.StateRef, String, java.time.Instant, java.time.Instant, net.corda.core.node.services.Vault$StateStatus, net.corda.core.identity.AbstractParty, String, java.time.Instant)
   public boolean equals(Object)
-  @org.jetbrains.annotations.Nullable public final java.time.Instant getConsumedTime()
-  @org.jetbrains.annotations.NotNull public final String getContractStateClassName()
-  @org.jetbrains.annotations.Nullable public final String getLockId()
-  @org.jetbrains.annotations.Nullable public final java.time.Instant getLockUpdateTime()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.identity.AbstractParty getNotary()
-  @org.jetbrains.annotations.NotNull public final java.time.Instant getRecordedTime()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.StateRef getRef()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.Vault$StateStatus getStatus()
+  @Nullable
+  public final java.time.Instant getConsumedTime()
+  @NotNull
+  public final String getContractStateClassName()
+  @Nullable
+  public final String getLockId()
+  @Nullable
+  public final java.time.Instant getLockUpdateTime()
+  @Nullable
+  public final net.corda.core.identity.AbstractParty getNotary()
+  @NotNull
+  public final java.time.Instant getRecordedTime()
+  @NotNull
+  public final net.corda.core.contracts.StateRef getRef()
+  @NotNull
+  public final net.corda.core.node.services.Vault$StateStatus getStatus()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.Vault$StateStatus extends java.lang.Enum
-  protected <init>(String, int)
+@CordaSerializable
+public static final class net.corda.core.node.services.Vault$StateStatus extends java.lang.Enum
+  protected <init>()
   public static net.corda.core.node.services.Vault$StateStatus valueOf(String)
   public static net.corda.core.node.services.Vault$StateStatus[] values()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.Vault$Update extends java.lang.Object
-  public <init>(Set, Set, UUID, net.corda.core.node.services.Vault$UpdateType)
-  @org.jetbrains.annotations.NotNull public final Set component1()
-  @org.jetbrains.annotations.NotNull public final Set component2()
-  @org.jetbrains.annotations.Nullable public final UUID component3()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.Vault$UpdateType component4()
-  public final boolean containsType(Class, net.corda.core.node.services.Vault$StateStatus)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.Vault$Update copy(Set, Set, UUID, net.corda.core.node.services.Vault$UpdateType)
+@CordaSerializable
+public static final class net.corda.core.node.services.Vault$Update extends java.lang.Object
+  public <init>(java.util.Set<? extends net.corda.core.contracts.StateAndRef<? extends U>>, java.util.Set<? extends net.corda.core.contracts.StateAndRef<? extends U>>, java.util.UUID, net.corda.core.node.services.Vault$UpdateType)
+  @NotNull
+  public final java.util.Set<net.corda.core.contracts.StateAndRef<U>> component1()
+  @NotNull
+  public final java.util.Set<net.corda.core.contracts.StateAndRef<U>> component2()
+  @Nullable
+  public final java.util.UUID component3()
+  @NotNull
+  public final net.corda.core.node.services.Vault$UpdateType component4()
+  public final boolean containsType(Class<T>, net.corda.core.node.services.Vault$StateStatus)
+  @NotNull
+  public final net.corda.core.node.services.Vault$Update<U> copy(java.util.Set<? extends net.corda.core.contracts.StateAndRef<? extends U>>, java.util.Set<? extends net.corda.core.contracts.StateAndRef<? extends U>>, java.util.UUID, net.corda.core.node.services.Vault$UpdateType)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final Set getConsumed()
-  @org.jetbrains.annotations.Nullable public final UUID getFlowId()
-  @org.jetbrains.annotations.NotNull public final Set getProduced()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.Vault$UpdateType getType()
+  @NotNull
+  public final java.util.Set<net.corda.core.contracts.StateAndRef<U>> getConsumed()
+  @Nullable
+  public final java.util.UUID getFlowId()
+  @NotNull
+  public final java.util.Set<net.corda.core.contracts.StateAndRef<U>> getProduced()
+  @NotNull
+  public final net.corda.core.node.services.Vault$UpdateType getType()
   public int hashCode()
   public final boolean isEmpty()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.Vault$Update plus(net.corda.core.node.services.Vault$Update)
-  @org.jetbrains.annotations.NotNull public String toString()
+  @NotNull
+  public final net.corda.core.node.services.Vault$Update<U> plus(net.corda.core.node.services.Vault$Update<U>)
+  @NotNull
+  public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.Vault$UpdateType extends java.lang.Enum
-  protected <init>(String, int)
+@CordaSerializable
+public static final class net.corda.core.node.services.Vault$UpdateType extends java.lang.Enum
+  protected <init>()
   public static net.corda.core.node.services.Vault$UpdateType valueOf(String)
   public static net.corda.core.node.services.Vault$UpdateType[] values()
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.node.services.VaultQueryException extends net.corda.core.flows.FlowException
+@CordaSerializable
+public final class net.corda.core.node.services.VaultQueryException extends net.corda.core.flows.FlowException
   public <init>(String)
 ##
-@net.corda.core.DoNotImplement public interface net.corda.core.node.services.VaultService
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.node.services.Vault$Page _queryBy(net.corda.core.node.services.vault.QueryCriteria, net.corda.core.node.services.vault.PageSpecification, net.corda.core.node.services.vault.Sort, Class)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.messaging.DataFeed _trackBy(net.corda.core.node.services.vault.QueryCriteria, net.corda.core.node.services.vault.PageSpecification, net.corda.core.node.services.vault.Sort, Class)
+@DoNotImplement
+public interface net.corda.core.node.services.VaultService
+  @NotNull
+  public abstract net.corda.core.node.services.Vault$Page<T> _queryBy(net.corda.core.node.services.vault.QueryCriteria, net.corda.core.node.services.vault.PageSpecification, net.corda.core.node.services.vault.Sort, Class<? extends T>)
+  @NotNull
+  public abstract net.corda.core.messaging.DataFeed<net.corda.core.node.services.Vault$Page<T>, net.corda.core.node.services.Vault$Update<T>> _trackBy(net.corda.core.node.services.vault.QueryCriteria, net.corda.core.node.services.vault.PageSpecification, net.corda.core.node.services.vault.Sort, Class<? extends T>)
   public abstract void addNoteToTransaction(net.corda.core.crypto.SecureHash, String)
-  @org.jetbrains.annotations.NotNull public abstract rx.Observable getRawUpdates()
-  @org.jetbrains.annotations.NotNull public abstract Iterable getTransactionNotes(net.corda.core.crypto.SecureHash)
-  @org.jetbrains.annotations.NotNull public abstract rx.Observable getUpdates()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.node.services.Vault$Page queryBy(Class)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.node.services.Vault$Page queryBy(Class, net.corda.core.node.services.vault.QueryCriteria)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.node.services.Vault$Page queryBy(Class, net.corda.core.node.services.vault.QueryCriteria, net.corda.core.node.services.vault.PageSpecification)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.node.services.Vault$Page queryBy(Class, net.corda.core.node.services.vault.QueryCriteria, net.corda.core.node.services.vault.PageSpecification, net.corda.core.node.services.vault.Sort)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.node.services.Vault$Page queryBy(Class, net.corda.core.node.services.vault.QueryCriteria, net.corda.core.node.services.vault.Sort)
-  public abstract void softLockRelease(UUID, net.corda.core.utilities.NonEmptySet)
-  public abstract void softLockReserve(UUID, net.corda.core.utilities.NonEmptySet)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.messaging.DataFeed trackBy(Class)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.messaging.DataFeed trackBy(Class, net.corda.core.node.services.vault.QueryCriteria)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.messaging.DataFeed trackBy(Class, net.corda.core.node.services.vault.QueryCriteria, net.corda.core.node.services.vault.PageSpecification)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.messaging.DataFeed trackBy(Class, net.corda.core.node.services.vault.QueryCriteria, net.corda.core.node.services.vault.PageSpecification, net.corda.core.node.services.vault.Sort)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.messaging.DataFeed trackBy(Class, net.corda.core.node.services.vault.QueryCriteria, net.corda.core.node.services.vault.Sort)
-  @co.paralleluniverse.fibers.Suspendable @org.jetbrains.annotations.NotNull public abstract List tryLockFungibleStatesForSpending(UUID, net.corda.core.node.services.vault.QueryCriteria, net.corda.core.contracts.Amount, Class)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.concurrent.CordaFuture whenConsumed(net.corda.core.contracts.StateRef)
+  @NotNull
+  public abstract rx.Observable<net.corda.core.node.services.Vault$Update<net.corda.core.contracts.ContractState>> getRawUpdates()
+  @NotNull
+  public abstract Iterable<String> getTransactionNotes(net.corda.core.crypto.SecureHash)
+  @NotNull
+  public abstract rx.Observable<net.corda.core.node.services.Vault$Update<net.corda.core.contracts.ContractState>> getUpdates()
+  @NotNull
+  public abstract net.corda.core.node.services.Vault$Page<T> queryBy(Class<? extends T>)
+  @NotNull
+  public abstract net.corda.core.node.services.Vault$Page<T> queryBy(Class<? extends T>, net.corda.core.node.services.vault.QueryCriteria)
+  @NotNull
+  public abstract net.corda.core.node.services.Vault$Page<T> queryBy(Class<? extends T>, net.corda.core.node.services.vault.QueryCriteria, net.corda.core.node.services.vault.PageSpecification)
+  @NotNull
+  public abstract net.corda.core.node.services.Vault$Page<T> queryBy(Class<? extends T>, net.corda.core.node.services.vault.QueryCriteria, net.corda.core.node.services.vault.PageSpecification, net.corda.core.node.services.vault.Sort)
+  @NotNull
+  public abstract net.corda.core.node.services.Vault$Page<T> queryBy(Class<? extends T>, net.corda.core.node.services.vault.QueryCriteria, net.corda.core.node.services.vault.Sort)
+  public abstract void softLockRelease(java.util.UUID, net.corda.core.utilities.NonEmptySet<net.corda.core.contracts.StateRef>)
+  public abstract void softLockReserve(java.util.UUID, net.corda.core.utilities.NonEmptySet<net.corda.core.contracts.StateRef>)
+  @NotNull
+  public abstract net.corda.core.messaging.DataFeed<net.corda.core.node.services.Vault$Page<T>, net.corda.core.node.services.Vault$Update<T>> trackBy(Class<? extends T>)
+  @NotNull
+  public abstract net.corda.core.messaging.DataFeed<net.corda.core.node.services.Vault$Page<T>, net.corda.core.node.services.Vault$Update<T>> trackBy(Class<? extends T>, net.corda.core.node.services.vault.QueryCriteria)
+  @NotNull
+  public abstract net.corda.core.messaging.DataFeed<net.corda.core.node.services.Vault$Page<T>, net.corda.core.node.services.Vault$Update<T>> trackBy(Class<? extends T>, net.corda.core.node.services.vault.QueryCriteria, net.corda.core.node.services.vault.PageSpecification)
+  @NotNull
+  public abstract net.corda.core.messaging.DataFeed<net.corda.core.node.services.Vault$Page<T>, net.corda.core.node.services.Vault$Update<T>> trackBy(Class<? extends T>, net.corda.core.node.services.vault.QueryCriteria, net.corda.core.node.services.vault.PageSpecification, net.corda.core.node.services.vault.Sort)
+  @NotNull
+  public abstract net.corda.core.messaging.DataFeed<net.corda.core.node.services.Vault$Page<T>, net.corda.core.node.services.Vault$Update<T>> trackBy(Class<? extends T>, net.corda.core.node.services.vault.QueryCriteria, net.corda.core.node.services.vault.Sort)
+  @Suspendable
+  @NotNull
+  public abstract java.util.List<net.corda.core.contracts.StateAndRef<T>> tryLockFungibleStatesForSpending(java.util.UUID, net.corda.core.node.services.vault.QueryCriteria, net.corda.core.contracts.Amount<U>, Class<? extends T>)
+  @NotNull
+  public abstract net.corda.core.concurrent.CordaFuture<net.corda.core.node.services.Vault$Update<net.corda.core.contracts.ContractState>> whenConsumed(net.corda.core.contracts.StateRef)
 ##
 public final class net.corda.core.node.services.VaultServiceKt extends java.lang.Object
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.node.services.vault.AggregateFunctionType extends java.lang.Enum
-  protected <init>(String, int)
+@CordaSerializable
+public final class net.corda.core.node.services.vault.AggregateFunctionType extends java.lang.Enum
+  protected <init>()
   public static net.corda.core.node.services.vault.AggregateFunctionType valueOf(String)
   public static net.corda.core.node.services.vault.AggregateFunctionType[] values()
 ##
-@net.corda.core.serialization.CordaSerializable public abstract class net.corda.core.node.services.vault.AttachmentQueryCriteria extends java.lang.Object implements net.corda.core.node.services.vault.GenericQueryCriteria$ChainableQueryCriteria, net.corda.core.node.services.vault.GenericQueryCriteria
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.services.vault.AttachmentQueryCriteria and(net.corda.core.node.services.vault.AttachmentQueryCriteria)
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.services.vault.AttachmentQueryCriteria or(net.corda.core.node.services.vault.AttachmentQueryCriteria)
+@CordaSerializable
+public abstract class net.corda.core.node.services.vault.AttachmentQueryCriteria extends java.lang.Object implements net.corda.core.node.services.vault.GenericQueryCriteria$ChainableQueryCriteria, net.corda.core.node.services.vault.GenericQueryCriteria
+  @NotNull
+  public net.corda.core.node.services.vault.AttachmentQueryCriteria and(net.corda.core.node.services.vault.AttachmentQueryCriteria)
+  @NotNull
+  public net.corda.core.node.services.vault.AttachmentQueryCriteria or(net.corda.core.node.services.vault.AttachmentQueryCriteria)
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.vault.AttachmentQueryCriteria$AndComposition extends net.corda.core.node.services.vault.AttachmentQueryCriteria implements net.corda.core.node.services.vault.GenericQueryCriteria$ChainableQueryCriteria$AndVisitor
+@CordaSerializable
+public static final class net.corda.core.node.services.vault.AttachmentQueryCriteria$AndComposition extends net.corda.core.node.services.vault.AttachmentQueryCriteria implements net.corda.core.node.services.vault.GenericQueryCriteria$ChainableQueryCriteria$AndVisitor
   public <init>(net.corda.core.node.services.vault.AttachmentQueryCriteria, net.corda.core.node.services.vault.AttachmentQueryCriteria)
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.services.vault.AttachmentQueryCriteria getA()
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.services.vault.AttachmentQueryCriteria getB()
-  @org.jetbrains.annotations.NotNull public Collection visit(net.corda.core.node.services.vault.AttachmentsQueryCriteriaParser)
+  @NotNull
+  public net.corda.core.node.services.vault.AttachmentQueryCriteria getA()
+  @NotNull
+  public net.corda.core.node.services.vault.AttachmentQueryCriteria getB()
+  @NotNull
+  public java.util.Collection<javax.persistence.criteria.Predicate> visit(net.corda.core.node.services.vault.AttachmentsQueryCriteriaParser)
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.vault.AttachmentQueryCriteria$AttachmentsQueryCriteria extends net.corda.core.node.services.vault.AttachmentQueryCriteria
+@CordaSerializable
+public static final class net.corda.core.node.services.vault.AttachmentQueryCriteria$AttachmentsQueryCriteria extends net.corda.core.node.services.vault.AttachmentQueryCriteria
   public <init>()
-  public <init>(net.corda.core.node.services.vault.ColumnPredicate)
-  public <init>(net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate)
-  public <init>(net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate)
-  @org.jetbrains.annotations.Nullable public final net.corda.core.node.services.vault.ColumnPredicate component1()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.node.services.vault.ColumnPredicate component2()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.node.services.vault.ColumnPredicate component3()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.AttachmentQueryCriteria$AttachmentsQueryCriteria copy(net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate, net.corda.core.node.services.vault.ColumnPredicate)
+  public <init>(net.corda.core.node.services.vault.ColumnPredicate<String>)
+  public <init>(net.corda.core.node.services.vault.ColumnPredicate<String>, net.corda.core.node.services.vault.ColumnPredicate<String>)
+  public <init>(net.corda.core.node.services.vault.ColumnPredicate<String>, net.corda.core.node.services.vault.ColumnPredicate<String>, net.corda.core.node.services.vault.ColumnPredicate<java.time.Instant>)
+  @Nullable
+  public final net.corda.core.node.services.vault.ColumnPredicate<String> component1()
+  @Nullable
+  public final net.corda.core.node.services.vault.ColumnPredicate<String> component2()
+  @Nullable
+  public final net.corda.core.node.services.vault.ColumnPredicate<java.time.Instant> component3()
+  @NotNull
+  public final net.corda.core.node.services.vault.AttachmentQueryCriteria$AttachmentsQueryCriteria copy(net.corda.core.node.services.vault.ColumnPredicate<String>, net.corda.core.node.services.vault.ColumnPredicate<String>, net.corda.core.node.services.vault.ColumnPredicate<java.time.Instant>)
   public boolean equals(Object)
-  @org.jetbrains.annotations.Nullable public final net.corda.core.node.services.vault.ColumnPredicate getFilenameCondition()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.node.services.vault.ColumnPredicate getUploadDateCondition()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.node.services.vault.ColumnPredicate getUploaderCondition()
+  @Nullable
+  public final net.corda.core.node.services.vault.ColumnPredicate<String> getFilenameCondition()
+  @Nullable
+  public final net.corda.core.node.services.vault.ColumnPredicate<java.time.Instant> getUploadDateCondition()
+  @Nullable
+  public final net.corda.core.node.services.vault.ColumnPredicate<String> getUploaderCondition()
   public int hashCode()
   public String toString()
-  @org.jetbrains.annotations.NotNull public Collection visit(net.corda.core.node.services.vault.AttachmentsQueryCriteriaParser)
+  @NotNull
+  public java.util.Collection<javax.persistence.criteria.Predicate> visit(net.corda.core.node.services.vault.AttachmentsQueryCriteriaParser)
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.vault.AttachmentQueryCriteria$OrComposition extends net.corda.core.node.services.vault.AttachmentQueryCriteria implements net.corda.core.node.services.vault.GenericQueryCriteria$ChainableQueryCriteria$OrVisitor
+@CordaSerializable
+public static final class net.corda.core.node.services.vault.AttachmentQueryCriteria$OrComposition extends net.corda.core.node.services.vault.AttachmentQueryCriteria implements net.corda.core.node.services.vault.GenericQueryCriteria$ChainableQueryCriteria$OrVisitor
   public <init>(net.corda.core.node.services.vault.AttachmentQueryCriteria, net.corda.core.node.services.vault.AttachmentQueryCriteria)
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.services.vault.AttachmentQueryCriteria getA()
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.services.vault.AttachmentQueryCriteria getB()
-  @org.jetbrains.annotations.NotNull public Collection visit(net.corda.core.node.services.vault.AttachmentsQueryCriteriaParser)
+  @NotNull
+  public net.corda.core.node.services.vault.AttachmentQueryCriteria getA()
+  @NotNull
+  public net.corda.core.node.services.vault.AttachmentQueryCriteria getB()
+  @NotNull
+  public java.util.Collection<javax.persistence.criteria.Predicate> visit(net.corda.core.node.services.vault.AttachmentsQueryCriteriaParser)
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.node.services.vault.AttachmentSort extends net.corda.core.node.services.vault.BaseSort
-  public <init>(Collection)
-  @org.jetbrains.annotations.NotNull public final Collection component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.AttachmentSort copy(Collection)
+@CordaSerializable
+public final class net.corda.core.node.services.vault.AttachmentSort extends net.corda.core.node.services.vault.BaseSort
+  public <init>(java.util.Collection<net.corda.core.node.services.vault.AttachmentSort$AttachmentSortColumn>)
+  @NotNull
+  public final java.util.Collection<net.corda.core.node.services.vault.AttachmentSort$AttachmentSortColumn> component1()
+  @NotNull
+  public final net.corda.core.node.services.vault.AttachmentSort copy(java.util.Collection<net.corda.core.node.services.vault.AttachmentSort$AttachmentSortColumn>)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final Collection getColumns()
+  @NotNull
+  public final java.util.Collection<net.corda.core.node.services.vault.AttachmentSort$AttachmentSortColumn> getColumns()
   public int hashCode()
   public String toString()
 ##
 public static final class net.corda.core.node.services.vault.AttachmentSort$AttachmentSortAttribute extends java.lang.Enum
-  protected <init>(String, int, String)
-  @org.jetbrains.annotations.NotNull public final String getColumnName()
+  protected <init>(String)
+  @NotNull
+  public final String getColumnName()
   public static net.corda.core.node.services.vault.AttachmentSort$AttachmentSortAttribute valueOf(String)
   public static net.corda.core.node.services.vault.AttachmentSort$AttachmentSortAttribute[] values()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.vault.AttachmentSort$AttachmentSortColumn extends java.lang.Object
+@CordaSerializable
+public static final class net.corda.core.node.services.vault.AttachmentSort$AttachmentSortColumn extends java.lang.Object
   public <init>(net.corda.core.node.services.vault.AttachmentSort$AttachmentSortAttribute, net.corda.core.node.services.vault.Sort$Direction)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.AttachmentSort$AttachmentSortAttribute component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.Sort$Direction component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.AttachmentSort$AttachmentSortColumn copy(net.corda.core.node.services.vault.AttachmentSort$AttachmentSortAttribute, net.corda.core.node.services.vault.Sort$Direction)
+  @NotNull
+  public final net.corda.core.node.services.vault.AttachmentSort$AttachmentSortAttribute component1()
+  @NotNull
+  public final net.corda.core.node.services.vault.Sort$Direction component2()
+  @NotNull
+  public final net.corda.core.node.services.vault.AttachmentSort$AttachmentSortColumn copy(net.corda.core.node.services.vault.AttachmentSort$AttachmentSortAttribute, net.corda.core.node.services.vault.Sort$Direction)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.Sort$Direction getDirection()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.AttachmentSort$AttachmentSortAttribute getSortAttribute()
+  @NotNull
+  public final net.corda.core.node.services.vault.Sort$Direction getDirection()
+  @NotNull
+  public final net.corda.core.node.services.vault.AttachmentSort$AttachmentSortAttribute getSortAttribute()
   public int hashCode()
   public String toString()
 ##
 public interface net.corda.core.node.services.vault.AttachmentsQueryCriteriaParser extends net.corda.core.node.services.vault.BaseQueryCriteriaParser
-  @org.jetbrains.annotations.NotNull public abstract Collection parseCriteria(net.corda.core.node.services.vault.AttachmentQueryCriteria$AttachmentsQueryCriteria)
+  @NotNull
+  public abstract java.util.Collection<javax.persistence.criteria.Predicate> parseCriteria(net.corda.core.node.services.vault.AttachmentQueryCriteria$AttachmentsQueryCriteria)
 ##
 public interface net.corda.core.node.services.vault.BaseQueryCriteriaParser
-  @org.jetbrains.annotations.NotNull public abstract Collection parse(net.corda.core.node.services.vault.GenericQueryCriteria, net.corda.core.node.services.vault.BaseSort)
-  @org.jetbrains.annotations.NotNull public abstract Collection parseAnd(net.corda.core.node.services.vault.GenericQueryCriteria, net.corda.core.node.services.vault.GenericQueryCriteria)
-  @org.jetbrains.annotations.NotNull public abstract Collection parseOr(net.corda.core.node.services.vault.GenericQueryCriteria, net.corda.core.node.services.vault.GenericQueryCriteria)
+  @NotNull
+  public abstract java.util.Collection<javax.persistence.criteria.Predicate> parse(Q, S)
+  @NotNull
+  public abstract java.util.Collection<javax.persistence.criteria.Predicate> parseAnd(Q, Q)
+  @NotNull
+  public abstract java.util.Collection<javax.persistence.criteria.Predicate> parseOr(Q, Q)
 ##
 public abstract class net.corda.core.node.services.vault.BaseSort extends java.lang.Object
   public <init>()
 ##
-@net.corda.core.DoNotImplement @net.corda.core.serialization.CordaSerializable public final class net.corda.core.node.services.vault.BinaryComparisonOperator extends java.lang.Enum implements net.corda.core.node.services.vault.Operator
-  protected <init>(String, int)
+@DoNotImplement
+@CordaSerializable
+public final class net.corda.core.node.services.vault.BinaryComparisonOperator extends java.lang.Enum implements net.corda.core.node.services.vault.Operator
+  protected <init>()
   public static net.corda.core.node.services.vault.BinaryComparisonOperator valueOf(String)
   public static net.corda.core.node.services.vault.BinaryComparisonOperator[] values()
 ##
-@net.corda.core.DoNotImplement @net.corda.core.serialization.CordaSerializable public final class net.corda.core.node.services.vault.BinaryLogicalOperator extends java.lang.Enum implements net.corda.core.node.services.vault.Operator
-  protected <init>(String, int)
+@DoNotImplement
+@CordaSerializable
+public final class net.corda.core.node.services.vault.BinaryLogicalOperator extends java.lang.Enum implements net.corda.core.node.services.vault.Operator
+  protected <init>()
   public static net.corda.core.node.services.vault.BinaryLogicalOperator valueOf(String)
   public static net.corda.core.node.services.vault.BinaryLogicalOperator[] values()
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.node.services.vault.Builder extends java.lang.Object
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression avg(reflect.Field)
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression avg(reflect.Field, List)
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression avg(reflect.Field, List, net.corda.core.node.services.vault.Sort$Direction)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression avg(kotlin.reflect.KProperty1, List, net.corda.core.node.services.vault.Sort$Direction)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.ColumnPredicate$Between between(Comparable, Comparable)
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression between(reflect.Field, Comparable, Comparable)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression between(kotlin.reflect.KProperty1, Comparable, Comparable)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.ColumnPredicate$BinaryComparison compare(net.corda.core.node.services.vault.BinaryComparisonOperator, Comparable)
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression comparePredicate(reflect.Field, net.corda.core.node.services.vault.BinaryComparisonOperator, Comparable)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression comparePredicate(kotlin.reflect.KProperty1, net.corda.core.node.services.vault.BinaryComparisonOperator, Comparable)
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression count(reflect.Field)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression count(kotlin.reflect.KProperty1)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.ColumnPredicate$EqualityComparison equal(Object)
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression equal(reflect.Field, Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression equal(kotlin.reflect.KProperty1, Object)
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression functionPredicate(reflect.Field, net.corda.core.node.services.vault.ColumnPredicate, List, net.corda.core.node.services.vault.Sort$Direction)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression functionPredicate(kotlin.reflect.KProperty1, net.corda.core.node.services.vault.ColumnPredicate, List, net.corda.core.node.services.vault.Sort$Direction)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.ColumnPredicate$BinaryComparison greaterThan(Comparable)
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression greaterThan(reflect.Field, Comparable)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression greaterThan(kotlin.reflect.KProperty1, Comparable)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.ColumnPredicate$BinaryComparison greaterThanOrEqual(Comparable)
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression greaterThanOrEqual(reflect.Field, Comparable)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression greaterThanOrEqual(kotlin.reflect.KProperty1, Comparable)
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression in(reflect.Field, Collection)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.ColumnPredicate$CollectionExpression in(Collection)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression in(kotlin.reflect.KProperty1, Collection)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.ColumnPredicate$NullExpression isNotNull()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.ColumnPredicate$NullExpression isNull()
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression isNull(reflect.Field)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression isNull(kotlin.reflect.KProperty1)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.ColumnPredicate$BinaryComparison lessThan(Comparable)
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression lessThan(reflect.Field, Comparable)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression lessThan(kotlin.reflect.KProperty1, Comparable)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.ColumnPredicate$BinaryComparison lessThanOrEqual(Comparable)
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression lessThanOrEqual(reflect.Field, Comparable)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression lessThanOrEqual(kotlin.reflect.KProperty1, Comparable)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.ColumnPredicate$Likeness like(String)
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression like(reflect.Field, String)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression like(kotlin.reflect.KProperty1, String)
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression max(reflect.Field)
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression max(reflect.Field, List)
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression max(reflect.Field, List, net.corda.core.node.services.vault.Sort$Direction)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression max(kotlin.reflect.KProperty1, List, net.corda.core.node.services.vault.Sort$Direction)
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression min(reflect.Field)
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression min(reflect.Field, List)
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression min(reflect.Field, List, net.corda.core.node.services.vault.Sort$Direction)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression min(kotlin.reflect.KProperty1, List, net.corda.core.node.services.vault.Sort$Direction)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.ColumnPredicate$EqualityComparison notEqual(Object)
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression notEqual(reflect.Field, Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression notEqual(kotlin.reflect.KProperty1, Object)
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression notIn(reflect.Field, Collection)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.ColumnPredicate$CollectionExpression notIn(Collection)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression notIn(kotlin.reflect.KProperty1, Collection)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.ColumnPredicate$Likeness notLike(String)
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression notLike(reflect.Field, String)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression notLike(kotlin.reflect.KProperty1, String)
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression notNull(reflect.Field)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression notNull(kotlin.reflect.KProperty1)
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression predicate(reflect.Field, net.corda.core.node.services.vault.ColumnPredicate)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression predicate(kotlin.reflect.KProperty1, net.corda.core.node.services.vault.ColumnPredicate)
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression sum(reflect.Field)
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression sum(reflect.Field, List)
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression sum(reflect.Field, List, net.corda.core.node.services.vault.Sort$Direction)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression sum(kotlin.reflect.KProperty1, List, net.corda.core.node.services.vault.Sort$Direction)
+@CordaSerializable
+public final class net.corda.core.node.services.vault.Builder extends java.lang.Object
+  @NotNull
+  public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression<Object, R> avg(reflect.Field)
+  @NotNull
+  public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression<Object, R> avg(reflect.Field, java.util.List<reflect.Field>)
+  @NotNull
+  public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression<Object, R> avg(reflect.Field, java.util.List<reflect.Field>, net.corda.core.node.services.vault.Sort$Direction)
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression<O, R> avg(kotlin.reflect.KProperty1<O, ? extends R>, java.util.List<? extends kotlin.reflect.KProperty1<O, ? extends R>>, net.corda.core.node.services.vault.Sort$Direction)
+  @NotNull
+  public final net.corda.core.node.services.vault.ColumnPredicate$Between<R> between(R, R)
+  @NotNull
+  public static final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression<Object, R> between(reflect.Field, R, R)
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression<O, R> between(kotlin.reflect.KProperty1<O, ? extends R>, R, R)
+  @NotNull
+  public final net.corda.core.node.services.vault.ColumnPredicate$BinaryComparison<R> compare(net.corda.core.node.services.vault.BinaryComparisonOperator, R)
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression<Object, R> comparePredicate(reflect.Field, net.corda.core.node.services.vault.BinaryComparisonOperator, R)
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression<O, R> comparePredicate(kotlin.reflect.KProperty1<O, ? extends R>, net.corda.core.node.services.vault.BinaryComparisonOperator, R)
+  @NotNull
+  public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression<Object, Object> count(reflect.Field)
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression<O, R> count(kotlin.reflect.KProperty1<O, ? extends R>)
+  @NotNull
+  public final net.corda.core.node.services.vault.ColumnPredicate$EqualityComparison<R> equal(R)
+  @NotNull
+  public static final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression<Object, R> equal(reflect.Field, R)
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression<O, R> equal(kotlin.reflect.KProperty1<O, ? extends R>, R)
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression<Object, R> functionPredicate(reflect.Field, net.corda.core.node.services.vault.ColumnPredicate<R>, java.util.List<? extends net.corda.core.node.services.vault.Column<Object, ? extends R>>, net.corda.core.node.services.vault.Sort$Direction)
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression<O, R> functionPredicate(kotlin.reflect.KProperty1<O, ? extends R>, net.corda.core.node.services.vault.ColumnPredicate<R>, java.util.List<? extends net.corda.core.node.services.vault.Column<O, ? extends R>>, net.corda.core.node.services.vault.Sort$Direction)
+  @NotNull
+  public final net.corda.core.node.services.vault.ColumnPredicate$BinaryComparison<R> greaterThan(R)
+  @NotNull
+  public static final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression<Object, R> greaterThan(reflect.Field, R)
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression<O, R> greaterThan(kotlin.reflect.KProperty1<O, ? extends R>, R)
+  @NotNull
+  public final net.corda.core.node.services.vault.ColumnPredicate$BinaryComparison<R> greaterThanOrEqual(R)
+  @NotNull
+  public static final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression<Object, R> greaterThanOrEqual(reflect.Field, R)
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression<O, R> greaterThanOrEqual(kotlin.reflect.KProperty1<O, ? extends R>, R)
+  @NotNull
+  public static final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression<Object, R> in(reflect.Field, java.util.Collection<? extends R>)
+  @NotNull
+  public final net.corda.core.node.services.vault.ColumnPredicate$CollectionExpression<R> in(java.util.Collection<? extends R>)
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression<O, R> in(kotlin.reflect.KProperty1<O, ? extends R>, java.util.Collection<? extends R>)
+  @NotNull
+  public final net.corda.core.node.services.vault.ColumnPredicate$NullExpression<R> isNotNull()
+  @NotNull
+  public final net.corda.core.node.services.vault.ColumnPredicate$NullExpression<R> isNull()
+  @NotNull
+  public static final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression<Object, Object> isNull(reflect.Field)
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression<O, R> isNull(kotlin.reflect.KProperty1<O, ? extends R>)
+  @NotNull
+  public final net.corda.core.node.services.vault.ColumnPredicate$BinaryComparison<R> lessThan(R)
+  @NotNull
+  public static final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression<Object, R> lessThan(reflect.Field, R)
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression<O, R> lessThan(kotlin.reflect.KProperty1<O, ? extends R>, R)
+  @NotNull
+  public final net.corda.core.node.services.vault.ColumnPredicate$BinaryComparison<R> lessThanOrEqual(R)
+  @NotNull
+  public static final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression<Object, R> lessThanOrEqual(reflect.Field, R)
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression<O, R> lessThanOrEqual(kotlin.reflect.KProperty1<O, ? extends R>, R)
+  @NotNull
+  public final net.corda.core.node.services.vault.ColumnPredicate$Likeness like(String)
+  @NotNull
+  public static final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression<Object, String> like(reflect.Field, String)
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression<O, String> like(kotlin.reflect.KProperty1<O, String>, String)
+  @NotNull
+  public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression<Object, R> max(reflect.Field)
+  @NotNull
+  public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression<Object, R> max(reflect.Field, java.util.List<reflect.Field>)
+  @NotNull
+  public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression<Object, R> max(reflect.Field, java.util.List<reflect.Field>, net.corda.core.node.services.vault.Sort$Direction)
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression<O, R> max(kotlin.reflect.KProperty1<O, ? extends R>, java.util.List<? extends kotlin.reflect.KProperty1<O, ? extends R>>, net.corda.core.node.services.vault.Sort$Direction)
+  @NotNull
+  public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression<Object, R> min(reflect.Field)
+  @NotNull
+  public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression<Object, R> min(reflect.Field, java.util.List<reflect.Field>)
+  @NotNull
+  public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression<Object, R> min(reflect.Field, java.util.List<reflect.Field>, net.corda.core.node.services.vault.Sort$Direction)
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression<O, R> min(kotlin.reflect.KProperty1<O, ? extends R>, java.util.List<? extends kotlin.reflect.KProperty1<O, ? extends R>>, net.corda.core.node.services.vault.Sort$Direction)
+  @NotNull
+  public final net.corda.core.node.services.vault.ColumnPredicate$EqualityComparison<R> notEqual(R)
+  @NotNull
+  public static final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression<Object, R> notEqual(reflect.Field, R)
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression<O, R> notEqual(kotlin.reflect.KProperty1<O, ? extends R>, R)
+  @NotNull
+  public static final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression<Object, R> notIn(reflect.Field, java.util.Collection<? extends R>)
+  @NotNull
+  public final net.corda.core.node.services.vault.ColumnPredicate$CollectionExpression<R> notIn(java.util.Collection<? extends R>)
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression<O, R> notIn(kotlin.reflect.KProperty1<O, ? extends R>, java.util.Collection<? extends R>)
+  @NotNull
+  public final net.corda.core.node.services.vault.ColumnPredicate$Likeness notLike(String)
+  @NotNull
+  public static final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression<Object, String> notLike(reflect.Field, String)
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression<O, String> notLike(kotlin.reflect.KProperty1<O, String>, String)
+  @NotNull
+  public static final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression<Object, Object> notNull(reflect.Field)
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression<O, R> notNull(kotlin.reflect.KProperty1<O, ? extends R>)
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression<Object, R> predicate(reflect.Field, net.corda.core.node.services.vault.ColumnPredicate<R>)
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression<O, R> predicate(kotlin.reflect.KProperty1<O, ? extends R>, net.corda.core.node.services.vault.ColumnPredicate<R>)
+  @NotNull
+  public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression<Object, R> sum(reflect.Field)
+  @NotNull
+  public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression<Object, R> sum(reflect.Field, java.util.List<reflect.Field>)
+  @NotNull
+  public static final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression<Object, R> sum(reflect.Field, java.util.List<reflect.Field>, net.corda.core.node.services.vault.Sort$Direction)
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression<O, R> sum(kotlin.reflect.KProperty1<O, ? extends R>, java.util.List<? extends kotlin.reflect.KProperty1<O, ? extends R>>, net.corda.core.node.services.vault.Sort$Direction)
   public static final net.corda.core.node.services.vault.Builder INSTANCE
 ##
-@net.corda.core.DoNotImplement @net.corda.core.serialization.CordaSerializable public final class net.corda.core.node.services.vault.CollectionOperator extends java.lang.Enum implements net.corda.core.node.services.vault.Operator
-  protected <init>(String, int)
+@DoNotImplement
+@CordaSerializable
+public final class net.corda.core.node.services.vault.CollectionOperator extends java.lang.Enum implements net.corda.core.node.services.vault.Operator
+  protected <init>()
   public static net.corda.core.node.services.vault.CollectionOperator valueOf(String)
   public static net.corda.core.node.services.vault.CollectionOperator[] values()
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.node.services.vault.Column extends java.lang.Object
-  public <init>(String, Class)
-  @kotlin.Deprecated public <init>(reflect.Field)
-  public <init>(kotlin.reflect.KProperty1)
-  @org.jetbrains.annotations.NotNull public final Class getDeclaringClass()
-  @org.jetbrains.annotations.NotNull public final String getName()
+@CordaSerializable
+public final class net.corda.core.node.services.vault.Column extends java.lang.Object
+  public <init>(String, Class<?>)
+  public <init>(reflect.Field)
+  public <init>(kotlin.reflect.KProperty1<O, ? extends C>)
+  @NotNull
+  public final Class<?> getDeclaringClass()
+  @NotNull
+  public final String getName()
 ##
-@net.corda.core.serialization.CordaSerializable public abstract class net.corda.core.node.services.vault.ColumnPredicate extends java.lang.Object
+@CordaSerializable
+public abstract class net.corda.core.node.services.vault.ColumnPredicate extends java.lang.Object
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.vault.ColumnPredicate$AggregateFunction extends net.corda.core.node.services.vault.ColumnPredicate
+@CordaSerializable
+public static final class net.corda.core.node.services.vault.ColumnPredicate$AggregateFunction extends net.corda.core.node.services.vault.ColumnPredicate
   public <init>(net.corda.core.node.services.vault.AggregateFunctionType)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.AggregateFunctionType component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.ColumnPredicate$AggregateFunction copy(net.corda.core.node.services.vault.AggregateFunctionType)
+  @NotNull
+  public final net.corda.core.node.services.vault.AggregateFunctionType component1()
+  @NotNull
+  public final net.corda.core.node.services.vault.ColumnPredicate$AggregateFunction<C> copy(net.corda.core.node.services.vault.AggregateFunctionType)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.AggregateFunctionType getType()
+  @NotNull
+  public final net.corda.core.node.services.vault.AggregateFunctionType getType()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.vault.ColumnPredicate$Between extends net.corda.core.node.services.vault.ColumnPredicate
-  public <init>(Comparable, Comparable)
-  @org.jetbrains.annotations.NotNull public final Comparable component1()
-  @org.jetbrains.annotations.NotNull public final Comparable component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.ColumnPredicate$Between copy(Comparable, Comparable)
+@CordaSerializable
+public static final class net.corda.core.node.services.vault.ColumnPredicate$Between extends net.corda.core.node.services.vault.ColumnPredicate
+  public <init>(C, C)
+  @NotNull
+  public final C component1()
+  @NotNull
+  public final C component2()
+  @NotNull
+  public final net.corda.core.node.services.vault.ColumnPredicate$Between<C> copy(C, C)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final Comparable getRightFromLiteral()
-  @org.jetbrains.annotations.NotNull public final Comparable getRightToLiteral()
+  @NotNull
+  public final C getRightFromLiteral()
+  @NotNull
+  public final C getRightToLiteral()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.vault.ColumnPredicate$BinaryComparison extends net.corda.core.node.services.vault.ColumnPredicate
-  public <init>(net.corda.core.node.services.vault.BinaryComparisonOperator, Comparable)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.BinaryComparisonOperator component1()
-  @org.jetbrains.annotations.NotNull public final Comparable component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.ColumnPredicate$BinaryComparison copy(net.corda.core.node.services.vault.BinaryComparisonOperator, Comparable)
+@CordaSerializable
+public static final class net.corda.core.node.services.vault.ColumnPredicate$BinaryComparison extends net.corda.core.node.services.vault.ColumnPredicate
+  public <init>(net.corda.core.node.services.vault.BinaryComparisonOperator, C)
+  @NotNull
+  public final net.corda.core.node.services.vault.BinaryComparisonOperator component1()
+  @NotNull
+  public final C component2()
+  @NotNull
+  public final net.corda.core.node.services.vault.ColumnPredicate$BinaryComparison<C> copy(net.corda.core.node.services.vault.BinaryComparisonOperator, C)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.BinaryComparisonOperator getOperator()
-  @org.jetbrains.annotations.NotNull public final Comparable getRightLiteral()
+  @NotNull
+  public final net.corda.core.node.services.vault.BinaryComparisonOperator getOperator()
+  @NotNull
+  public final C getRightLiteral()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.vault.ColumnPredicate$CollectionExpression extends net.corda.core.node.services.vault.ColumnPredicate
-  public <init>(net.corda.core.node.services.vault.CollectionOperator, Collection)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CollectionOperator component1()
-  @org.jetbrains.annotations.NotNull public final Collection component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.ColumnPredicate$CollectionExpression copy(net.corda.core.node.services.vault.CollectionOperator, Collection)
+@CordaSerializable
+public static final class net.corda.core.node.services.vault.ColumnPredicate$CollectionExpression extends net.corda.core.node.services.vault.ColumnPredicate
+  public <init>(net.corda.core.node.services.vault.CollectionOperator, java.util.Collection<? extends C>)
+  @NotNull
+  public final net.corda.core.node.services.vault.CollectionOperator component1()
+  @NotNull
+  public final java.util.Collection<C> component2()
+  @NotNull
+  public final net.corda.core.node.services.vault.ColumnPredicate$CollectionExpression<C> copy(net.corda.core.node.services.vault.CollectionOperator, java.util.Collection<? extends C>)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CollectionOperator getOperator()
-  @org.jetbrains.annotations.NotNull public final Collection getRightLiteral()
+  @NotNull
+  public final net.corda.core.node.services.vault.CollectionOperator getOperator()
+  @NotNull
+  public final java.util.Collection<C> getRightLiteral()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.vault.ColumnPredicate$EqualityComparison extends net.corda.core.node.services.vault.ColumnPredicate
-  public <init>(net.corda.core.node.services.vault.EqualityComparisonOperator, Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.EqualityComparisonOperator component1()
-  public final Object component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.ColumnPredicate$EqualityComparison copy(net.corda.core.node.services.vault.EqualityComparisonOperator, Object)
+@CordaSerializable
+public static final class net.corda.core.node.services.vault.ColumnPredicate$EqualityComparison extends net.corda.core.node.services.vault.ColumnPredicate
+  public <init>(net.corda.core.node.services.vault.EqualityComparisonOperator, C)
+  @NotNull
+  public final net.corda.core.node.services.vault.EqualityComparisonOperator component1()
+  public final C component2()
+  @NotNull
+  public final net.corda.core.node.services.vault.ColumnPredicate$EqualityComparison<C> copy(net.corda.core.node.services.vault.EqualityComparisonOperator, C)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.EqualityComparisonOperator getOperator()
-  public final Object getRightLiteral()
+  @NotNull
+  public final net.corda.core.node.services.vault.EqualityComparisonOperator getOperator()
+  public final C getRightLiteral()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.vault.ColumnPredicate$Likeness extends net.corda.core.node.services.vault.ColumnPredicate
+@CordaSerializable
+public static final class net.corda.core.node.services.vault.ColumnPredicate$Likeness extends net.corda.core.node.services.vault.ColumnPredicate
   public <init>(net.corda.core.node.services.vault.LikenessOperator, String)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.LikenessOperator component1()
-  @org.jetbrains.annotations.NotNull public final String component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.ColumnPredicate$Likeness copy(net.corda.core.node.services.vault.LikenessOperator, String)
+  @NotNull
+  public final net.corda.core.node.services.vault.LikenessOperator component1()
+  @NotNull
+  public final String component2()
+  @NotNull
+  public final net.corda.core.node.services.vault.ColumnPredicate$Likeness copy(net.corda.core.node.services.vault.LikenessOperator, String)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.LikenessOperator getOperator()
-  @org.jetbrains.annotations.NotNull public final String getRightLiteral()
+  @NotNull
+  public final net.corda.core.node.services.vault.LikenessOperator getOperator()
+  @NotNull
+  public final String getRightLiteral()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.vault.ColumnPredicate$NullExpression extends net.corda.core.node.services.vault.ColumnPredicate
+@CordaSerializable
+public static final class net.corda.core.node.services.vault.ColumnPredicate$NullExpression extends net.corda.core.node.services.vault.ColumnPredicate
   public <init>(net.corda.core.node.services.vault.NullOperator)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.NullOperator component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.ColumnPredicate$NullExpression copy(net.corda.core.node.services.vault.NullOperator)
+  @NotNull
+  public final net.corda.core.node.services.vault.NullOperator component1()
+  @NotNull
+  public final net.corda.core.node.services.vault.ColumnPredicate$NullExpression<C> copy(net.corda.core.node.services.vault.NullOperator)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.NullOperator getOperator()
+  @NotNull
+  public final net.corda.core.node.services.vault.NullOperator getOperator()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public abstract class net.corda.core.node.services.vault.CriteriaExpression extends java.lang.Object
+@CordaSerializable
+public abstract class net.corda.core.node.services.vault.CriteriaExpression extends java.lang.Object
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression extends net.corda.core.node.services.vault.CriteriaExpression
-  public <init>(net.corda.core.node.services.vault.Column, net.corda.core.node.services.vault.ColumnPredicate, List, net.corda.core.node.services.vault.Sort$Direction)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.Column component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.ColumnPredicate component2()
-  @org.jetbrains.annotations.Nullable public final List component3()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.node.services.vault.Sort$Direction component4()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression copy(net.corda.core.node.services.vault.Column, net.corda.core.node.services.vault.ColumnPredicate, List, net.corda.core.node.services.vault.Sort$Direction)
+@CordaSerializable
+public static final class net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression extends net.corda.core.node.services.vault.CriteriaExpression
+  public <init>(net.corda.core.node.services.vault.Column<O, ? extends C>, net.corda.core.node.services.vault.ColumnPredicate<C>, java.util.List<? extends net.corda.core.node.services.vault.Column<O, ? extends C>>, net.corda.core.node.services.vault.Sort$Direction)
+  @NotNull
+  public final net.corda.core.node.services.vault.Column<O, C> component1()
+  @NotNull
+  public final net.corda.core.node.services.vault.ColumnPredicate<C> component2()
+  @Nullable
+  public final java.util.List<net.corda.core.node.services.vault.Column<O, C>> component3()
+  @Nullable
+  public final net.corda.core.node.services.vault.Sort$Direction component4()
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression$AggregateFunctionExpression<O, C> copy(net.corda.core.node.services.vault.Column<O, ? extends C>, net.corda.core.node.services.vault.ColumnPredicate<C>, java.util.List<? extends net.corda.core.node.services.vault.Column<O, ? extends C>>, net.corda.core.node.services.vault.Sort$Direction)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.Column getColumn()
-  @org.jetbrains.annotations.Nullable public final List getGroupByColumns()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.node.services.vault.Sort$Direction getOrderBy()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.ColumnPredicate getPredicate()
+  @NotNull
+  public final net.corda.core.node.services.vault.Column<O, C> getColumn()
+  @Nullable
+  public final java.util.List<net.corda.core.node.services.vault.Column<O, C>> getGroupByColumns()
+  @Nullable
+  public final net.corda.core.node.services.vault.Sort$Direction getOrderBy()
+  @NotNull
+  public final net.corda.core.node.services.vault.ColumnPredicate<C> getPredicate()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.vault.CriteriaExpression$BinaryLogical extends net.corda.core.node.services.vault.CriteriaExpression
-  public <init>(net.corda.core.node.services.vault.CriteriaExpression, net.corda.core.node.services.vault.CriteriaExpression, net.corda.core.node.services.vault.BinaryLogicalOperator)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.BinaryLogicalOperator component3()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$BinaryLogical copy(net.corda.core.node.services.vault.CriteriaExpression, net.corda.core.node.services.vault.CriteriaExpression, net.corda.core.node.services.vault.BinaryLogicalOperator)
+@CordaSerializable
+public static final class net.corda.core.node.services.vault.CriteriaExpression$BinaryLogical extends net.corda.core.node.services.vault.CriteriaExpression
+  public <init>(net.corda.core.node.services.vault.CriteriaExpression<O, Boolean>, net.corda.core.node.services.vault.CriteriaExpression<O, Boolean>, net.corda.core.node.services.vault.BinaryLogicalOperator)
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression<O, Boolean> component1()
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression<O, Boolean> component2()
+  @NotNull
+  public final net.corda.core.node.services.vault.BinaryLogicalOperator component3()
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression$BinaryLogical<O> copy(net.corda.core.node.services.vault.CriteriaExpression<O, Boolean>, net.corda.core.node.services.vault.CriteriaExpression<O, Boolean>, net.corda.core.node.services.vault.BinaryLogicalOperator)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression getLeft()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.BinaryLogicalOperator getOperator()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression getRight()
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression<O, Boolean> getLeft()
+  @NotNull
+  public final net.corda.core.node.services.vault.BinaryLogicalOperator getOperator()
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression<O, Boolean> getRight()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression extends net.corda.core.node.services.vault.CriteriaExpression
-  public <init>(net.corda.core.node.services.vault.Column, net.corda.core.node.services.vault.ColumnPredicate)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.Column component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.ColumnPredicate component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression copy(net.corda.core.node.services.vault.Column, net.corda.core.node.services.vault.ColumnPredicate)
+@CordaSerializable
+public static final class net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression extends net.corda.core.node.services.vault.CriteriaExpression
+  public <init>(net.corda.core.node.services.vault.Column<O, ? extends C>, net.corda.core.node.services.vault.ColumnPredicate<C>)
+  @NotNull
+  public final net.corda.core.node.services.vault.Column<O, C> component1()
+  @NotNull
+  public final net.corda.core.node.services.vault.ColumnPredicate<C> component2()
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression$ColumnPredicateExpression<O, C> copy(net.corda.core.node.services.vault.Column<O, ? extends C>, net.corda.core.node.services.vault.ColumnPredicate<C>)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.Column getColumn()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.ColumnPredicate getPredicate()
+  @NotNull
+  public final net.corda.core.node.services.vault.Column<O, C> getColumn()
+  @NotNull
+  public final net.corda.core.node.services.vault.ColumnPredicate<C> getPredicate()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.vault.CriteriaExpression$Not extends net.corda.core.node.services.vault.CriteriaExpression
-  public <init>(net.corda.core.node.services.vault.CriteriaExpression)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression$Not copy(net.corda.core.node.services.vault.CriteriaExpression)
+@CordaSerializable
+public static final class net.corda.core.node.services.vault.CriteriaExpression$Not extends net.corda.core.node.services.vault.CriteriaExpression
+  public <init>(net.corda.core.node.services.vault.CriteriaExpression<O, Boolean>)
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression<O, Boolean> component1()
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression$Not<O> copy(net.corda.core.node.services.vault.CriteriaExpression<O, Boolean>)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression getExpression()
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression<O, Boolean> getExpression()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.DoNotImplement @net.corda.core.serialization.CordaSerializable public final class net.corda.core.node.services.vault.EqualityComparisonOperator extends java.lang.Enum implements net.corda.core.node.services.vault.Operator
-  protected <init>(String, int)
+@DoNotImplement
+@CordaSerializable
+public final class net.corda.core.node.services.vault.EqualityComparisonOperator extends java.lang.Enum implements net.corda.core.node.services.vault.Operator
+  protected <init>()
   public static net.corda.core.node.services.vault.EqualityComparisonOperator valueOf(String)
   public static net.corda.core.node.services.vault.EqualityComparisonOperator[] values()
 ##
 public interface net.corda.core.node.services.vault.GenericQueryCriteria
-  @org.jetbrains.annotations.NotNull public abstract Collection visit(net.corda.core.node.services.vault.BaseQueryCriteriaParser)
+  @NotNull
+  public abstract java.util.Collection<javax.persistence.criteria.Predicate> visit(P)
 ##
 public static interface net.corda.core.node.services.vault.GenericQueryCriteria$ChainableQueryCriteria
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.node.services.vault.GenericQueryCriteria and(net.corda.core.node.services.vault.GenericQueryCriteria)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.node.services.vault.GenericQueryCriteria or(net.corda.core.node.services.vault.GenericQueryCriteria)
+  @NotNull
+  public abstract Q and(Q)
+  @NotNull
+  public abstract Q or(Q)
 ##
 public static interface net.corda.core.node.services.vault.GenericQueryCriteria$ChainableQueryCriteria$AndVisitor extends net.corda.core.node.services.vault.GenericQueryCriteria
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.node.services.vault.GenericQueryCriteria getA()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.node.services.vault.GenericQueryCriteria getB()
-  @org.jetbrains.annotations.NotNull public abstract Collection visit(net.corda.core.node.services.vault.BaseQueryCriteriaParser)
+  @NotNull
+  public abstract Q getA()
+  @NotNull
+  public abstract Q getB()
+  @NotNull
+  public abstract java.util.Collection<javax.persistence.criteria.Predicate> visit(P)
 ##
 public static interface net.corda.core.node.services.vault.GenericQueryCriteria$ChainableQueryCriteria$OrVisitor extends net.corda.core.node.services.vault.GenericQueryCriteria
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.node.services.vault.GenericQueryCriteria getA()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.node.services.vault.GenericQueryCriteria getB()
-  @org.jetbrains.annotations.NotNull public abstract Collection visit(net.corda.core.node.services.vault.BaseQueryCriteriaParser)
+  @NotNull
+  public abstract Q getA()
+  @NotNull
+  public abstract Q getB()
+  @NotNull
+  public abstract java.util.Collection<javax.persistence.criteria.Predicate> visit(P)
 ##
-@net.corda.core.DoNotImplement public interface net.corda.core.node.services.vault.IQueryCriteriaParser extends net.corda.core.node.services.vault.BaseQueryCriteriaParser
-  @org.jetbrains.annotations.NotNull public abstract Collection parseCriteria(net.corda.core.node.services.vault.QueryCriteria$CommonQueryCriteria)
-  @org.jetbrains.annotations.NotNull public abstract Collection parseCriteria(net.corda.core.node.services.vault.QueryCriteria$FungibleAssetQueryCriteria)
-  @org.jetbrains.annotations.NotNull public abstract Collection parseCriteria(net.corda.core.node.services.vault.QueryCriteria$LinearStateQueryCriteria)
-  @org.jetbrains.annotations.NotNull public abstract Collection parseCriteria(net.corda.core.node.services.vault.QueryCriteria$VaultCustomQueryCriteria)
-  @org.jetbrains.annotations.NotNull public abstract Collection parseCriteria(net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria)
+@DoNotImplement
+public interface net.corda.core.node.services.vault.IQueryCriteriaParser extends net.corda.core.node.services.vault.BaseQueryCriteriaParser
+  @NotNull
+  public abstract java.util.Collection<javax.persistence.criteria.Predicate> parseCriteria(net.corda.core.node.services.vault.QueryCriteria$CommonQueryCriteria)
+  @NotNull
+  public abstract java.util.Collection<javax.persistence.criteria.Predicate> parseCriteria(net.corda.core.node.services.vault.QueryCriteria$FungibleAssetQueryCriteria)
+  @NotNull
+  public abstract java.util.Collection<javax.persistence.criteria.Predicate> parseCriteria(net.corda.core.node.services.vault.QueryCriteria$LinearStateQueryCriteria)
+  @NotNull
+  public abstract java.util.Collection<javax.persistence.criteria.Predicate> parseCriteria(net.corda.core.node.services.vault.QueryCriteria$VaultCustomQueryCriteria<L>)
+  @NotNull
+  public abstract java.util.Collection<javax.persistence.criteria.Predicate> parseCriteria(net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria)
 ##
-@net.corda.core.DoNotImplement @net.corda.core.serialization.CordaSerializable public final class net.corda.core.node.services.vault.LikenessOperator extends java.lang.Enum implements net.corda.core.node.services.vault.Operator
-  protected <init>(String, int)
+@DoNotImplement
+@CordaSerializable
+public final class net.corda.core.node.services.vault.LikenessOperator extends java.lang.Enum implements net.corda.core.node.services.vault.Operator
+  protected <init>()
   public static net.corda.core.node.services.vault.LikenessOperator valueOf(String)
   public static net.corda.core.node.services.vault.LikenessOperator[] values()
 ##
-@net.corda.core.DoNotImplement @net.corda.core.serialization.CordaSerializable public final class net.corda.core.node.services.vault.NullOperator extends java.lang.Enum implements net.corda.core.node.services.vault.Operator
-  protected <init>(String, int)
+@DoNotImplement
+@CordaSerializable
+public final class net.corda.core.node.services.vault.NullOperator extends java.lang.Enum implements net.corda.core.node.services.vault.Operator
+  protected <init>()
   public static net.corda.core.node.services.vault.NullOperator valueOf(String)
   public static net.corda.core.node.services.vault.NullOperator[] values()
 ##
-@net.corda.core.DoNotImplement @net.corda.core.serialization.CordaSerializable public interface net.corda.core.node.services.vault.Operator
+@DoNotImplement
+@CordaSerializable
+public interface net.corda.core.node.services.vault.Operator
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.node.services.vault.PageSpecification extends java.lang.Object
+@CordaSerializable
+public final class net.corda.core.node.services.vault.PageSpecification extends java.lang.Object
   public <init>()
   public <init>(int, int)
   public final int component1()
   public final int component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.PageSpecification copy(int, int)
+  @NotNull
+  public final net.corda.core.node.services.vault.PageSpecification copy(int, int)
   public boolean equals(Object)
   public final int getPageNumber()
   public final int getPageSize()
@@ -2520,235 +3903,358 @@ public static interface net.corda.core.node.services.vault.GenericQueryCriteria$
   public final boolean isDefault()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public abstract class net.corda.core.node.services.vault.QueryCriteria extends java.lang.Object implements net.corda.core.node.services.vault.GenericQueryCriteria$ChainableQueryCriteria, net.corda.core.node.services.vault.GenericQueryCriteria
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.services.vault.QueryCriteria and(net.corda.core.node.services.vault.QueryCriteria)
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.services.vault.QueryCriteria or(net.corda.core.node.services.vault.QueryCriteria)
+@CordaSerializable
+public abstract class net.corda.core.node.services.vault.QueryCriteria extends java.lang.Object implements net.corda.core.node.services.vault.GenericQueryCriteria$ChainableQueryCriteria, net.corda.core.node.services.vault.GenericQueryCriteria
+  @NotNull
+  public net.corda.core.node.services.vault.QueryCriteria and(net.corda.core.node.services.vault.QueryCriteria)
+  @NotNull
+  public net.corda.core.node.services.vault.QueryCriteria or(net.corda.core.node.services.vault.QueryCriteria)
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.vault.QueryCriteria$AndComposition extends net.corda.core.node.services.vault.QueryCriteria implements net.corda.core.node.services.vault.GenericQueryCriteria$ChainableQueryCriteria$AndVisitor
+@CordaSerializable
+public static final class net.corda.core.node.services.vault.QueryCriteria$AndComposition extends net.corda.core.node.services.vault.QueryCriteria implements net.corda.core.node.services.vault.GenericQueryCriteria$ChainableQueryCriteria$AndVisitor
   public <init>(net.corda.core.node.services.vault.QueryCriteria, net.corda.core.node.services.vault.QueryCriteria)
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.services.vault.QueryCriteria getA()
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.services.vault.QueryCriteria getB()
-  @org.jetbrains.annotations.NotNull public Collection visit(net.corda.core.node.services.vault.IQueryCriteriaParser)
+  @NotNull
+  public net.corda.core.node.services.vault.QueryCriteria getA()
+  @NotNull
+  public net.corda.core.node.services.vault.QueryCriteria getB()
+  @NotNull
+  public java.util.Collection<javax.persistence.criteria.Predicate> visit(net.corda.core.node.services.vault.IQueryCriteriaParser)
 ##
-@net.corda.core.serialization.CordaSerializable public abstract static class net.corda.core.node.services.vault.QueryCriteria$CommonQueryCriteria extends net.corda.core.node.services.vault.QueryCriteria
+@CordaSerializable
+public abstract static class net.corda.core.node.services.vault.QueryCriteria$CommonQueryCriteria extends net.corda.core.node.services.vault.QueryCriteria
   public <init>()
-  @org.jetbrains.annotations.Nullable public abstract Set getContractStateTypes()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.node.services.Vault$StateStatus getStatus()
-  @org.jetbrains.annotations.NotNull public Collection visit(net.corda.core.node.services.vault.IQueryCriteriaParser)
+  @Nullable
+  public abstract java.util.Set<Class<? extends net.corda.core.contracts.ContractState>> getContractStateTypes()
+  @NotNull
+  public abstract net.corda.core.node.services.Vault$StateStatus getStatus()
+  @NotNull
+  public java.util.Collection<javax.persistence.criteria.Predicate> visit(net.corda.core.node.services.vault.IQueryCriteriaParser)
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.vault.QueryCriteria$FungibleAssetQueryCriteria extends net.corda.core.node.services.vault.QueryCriteria$CommonQueryCriteria
+@CordaSerializable
+public static final class net.corda.core.node.services.vault.QueryCriteria$FungibleAssetQueryCriteria extends net.corda.core.node.services.vault.QueryCriteria$CommonQueryCriteria
   public <init>()
-  public <init>(List)
-  public <init>(List, List)
-  public <init>(List, List, net.corda.core.node.services.vault.ColumnPredicate)
-  public <init>(List, List, net.corda.core.node.services.vault.ColumnPredicate, List)
-  public <init>(List, List, net.corda.core.node.services.vault.ColumnPredicate, List, List)
-  public <init>(List, List, net.corda.core.node.services.vault.ColumnPredicate, List, List, net.corda.core.node.services.Vault$StateStatus)
-  public <init>(List, List, net.corda.core.node.services.vault.ColumnPredicate, List, List, net.corda.core.node.services.Vault$StateStatus, Set)
-  @org.jetbrains.annotations.Nullable public final List component1()
-  @org.jetbrains.annotations.Nullable public final List component2()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.node.services.vault.ColumnPredicate component3()
-  @org.jetbrains.annotations.Nullable public final List component4()
-  @org.jetbrains.annotations.Nullable public final List component5()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.Vault$StateStatus component6()
-  @org.jetbrains.annotations.Nullable public final Set component7()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.QueryCriteria$FungibleAssetQueryCriteria copy(List, List, net.corda.core.node.services.vault.ColumnPredicate, List, List, net.corda.core.node.services.Vault$StateStatus, Set)
+  public <init>(java.util.List<? extends net.corda.core.identity.AbstractParty>)
+  public <init>(java.util.List<? extends net.corda.core.identity.AbstractParty>, java.util.List<? extends net.corda.core.identity.AbstractParty>)
+  public <init>(java.util.List<? extends net.corda.core.identity.AbstractParty>, java.util.List<? extends net.corda.core.identity.AbstractParty>, net.corda.core.node.services.vault.ColumnPredicate<Long>)
+  public <init>(java.util.List<? extends net.corda.core.identity.AbstractParty>, java.util.List<? extends net.corda.core.identity.AbstractParty>, net.corda.core.node.services.vault.ColumnPredicate<Long>, java.util.List<? extends net.corda.core.identity.AbstractParty>)
+  public <init>(java.util.List<? extends net.corda.core.identity.AbstractParty>, java.util.List<? extends net.corda.core.identity.AbstractParty>, net.corda.core.node.services.vault.ColumnPredicate<Long>, java.util.List<? extends net.corda.core.identity.AbstractParty>, java.util.List<? extends net.corda.core.utilities.OpaqueBytes>)
+  public <init>(java.util.List<? extends net.corda.core.identity.AbstractParty>, java.util.List<? extends net.corda.core.identity.AbstractParty>, net.corda.core.node.services.vault.ColumnPredicate<Long>, java.util.List<? extends net.corda.core.identity.AbstractParty>, java.util.List<? extends net.corda.core.utilities.OpaqueBytes>, net.corda.core.node.services.Vault$StateStatus)
+  public <init>(java.util.List<? extends net.corda.core.identity.AbstractParty>, java.util.List<? extends net.corda.core.identity.AbstractParty>, net.corda.core.node.services.vault.ColumnPredicate<Long>, java.util.List<? extends net.corda.core.identity.AbstractParty>, java.util.List<? extends net.corda.core.utilities.OpaqueBytes>, net.corda.core.node.services.Vault$StateStatus, java.util.Set<? extends Class<? extends net.corda.core.contracts.ContractState>>)
+  @Nullable
+  public final java.util.List<net.corda.core.identity.AbstractParty> component1()
+  @Nullable
+  public final java.util.List<net.corda.core.identity.AbstractParty> component2()
+  @Nullable
+  public final net.corda.core.node.services.vault.ColumnPredicate<Long> component3()
+  @Nullable
+  public final java.util.List<net.corda.core.identity.AbstractParty> component4()
+  @Nullable
+  public final java.util.List<net.corda.core.utilities.OpaqueBytes> component5()
+  @NotNull
+  public final net.corda.core.node.services.Vault$StateStatus component6()
+  @Nullable
+  public final java.util.Set<Class<? extends net.corda.core.contracts.ContractState>> component7()
+  @NotNull
+  public final net.corda.core.node.services.vault.QueryCriteria$FungibleAssetQueryCriteria copy(java.util.List<? extends net.corda.core.identity.AbstractParty>, java.util.List<? extends net.corda.core.identity.AbstractParty>, net.corda.core.node.services.vault.ColumnPredicate<Long>, java.util.List<? extends net.corda.core.identity.AbstractParty>, java.util.List<? extends net.corda.core.utilities.OpaqueBytes>, net.corda.core.node.services.Vault$StateStatus, java.util.Set<? extends Class<? extends net.corda.core.contracts.ContractState>>)
   public boolean equals(Object)
-  @org.jetbrains.annotations.Nullable public Set getContractStateTypes()
-  @org.jetbrains.annotations.Nullable public final List getIssuer()
-  @org.jetbrains.annotations.Nullable public final List getIssuerRef()
-  @org.jetbrains.annotations.Nullable public final List getOwner()
-  @org.jetbrains.annotations.Nullable public final List getParticipants()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.node.services.vault.ColumnPredicate getQuantity()
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.services.Vault$StateStatus getStatus()
+  @Nullable
+  public java.util.Set<Class<? extends net.corda.core.contracts.ContractState>> getContractStateTypes()
+  @Nullable
+  public final java.util.List<net.corda.core.identity.AbstractParty> getIssuer()
+  @Nullable
+  public final java.util.List<net.corda.core.utilities.OpaqueBytes> getIssuerRef()
+  @Nullable
+  public final java.util.List<net.corda.core.identity.AbstractParty> getOwner()
+  @Nullable
+  public final java.util.List<net.corda.core.identity.AbstractParty> getParticipants()
+  @Nullable
+  public final net.corda.core.node.services.vault.ColumnPredicate<Long> getQuantity()
+  @NotNull
+  public net.corda.core.node.services.Vault$StateStatus getStatus()
   public int hashCode()
   public String toString()
-  @org.jetbrains.annotations.NotNull public Collection visit(net.corda.core.node.services.vault.IQueryCriteriaParser)
+  @NotNull
+  public java.util.Collection<javax.persistence.criteria.Predicate> visit(net.corda.core.node.services.vault.IQueryCriteriaParser)
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.vault.QueryCriteria$LinearStateQueryCriteria extends net.corda.core.node.services.vault.QueryCriteria$CommonQueryCriteria
+@CordaSerializable
+public static final class net.corda.core.node.services.vault.QueryCriteria$LinearStateQueryCriteria extends net.corda.core.node.services.vault.QueryCriteria$CommonQueryCriteria
   public <init>()
-  public <init>(List)
-  public <init>(List, List)
-  public <init>(List, List, List)
-  public <init>(List, List, List, net.corda.core.node.services.Vault$StateStatus)
-  public <init>(List, List, List, net.corda.core.node.services.Vault$StateStatus, Set)
-  public <init>(List, List, net.corda.core.node.services.Vault$StateStatus, Set)
-  @org.jetbrains.annotations.Nullable public final List component1()
-  @org.jetbrains.annotations.Nullable public final List component2()
-  @org.jetbrains.annotations.Nullable public final List component3()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.Vault$StateStatus component4()
-  @org.jetbrains.annotations.Nullable public final Set component5()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.QueryCriteria$LinearStateQueryCriteria copy(List, List, List, net.corda.core.node.services.Vault$StateStatus, Set)
+  public <init>(java.util.List<? extends net.corda.core.identity.AbstractParty>)
+  public <init>(java.util.List<? extends net.corda.core.identity.AbstractParty>, java.util.List<java.util.UUID>)
+  public <init>(java.util.List<? extends net.corda.core.identity.AbstractParty>, java.util.List<java.util.UUID>, java.util.List<String>)
+  public <init>(java.util.List<? extends net.corda.core.identity.AbstractParty>, java.util.List<java.util.UUID>, java.util.List<String>, net.corda.core.node.services.Vault$StateStatus)
+  public <init>(java.util.List<? extends net.corda.core.identity.AbstractParty>, java.util.List<java.util.UUID>, java.util.List<String>, net.corda.core.node.services.Vault$StateStatus, java.util.Set<? extends Class<? extends net.corda.core.contracts.ContractState>>)
+  public <init>(java.util.List<? extends net.corda.core.identity.AbstractParty>, java.util.List<net.corda.core.contracts.UniqueIdentifier>, net.corda.core.node.services.Vault$StateStatus, java.util.Set<? extends Class<? extends net.corda.core.contracts.ContractState>>)
+  @Nullable
+  public final java.util.List<net.corda.core.identity.AbstractParty> component1()
+  @Nullable
+  public final java.util.List<java.util.UUID> component2()
+  @Nullable
+  public final java.util.List<String> component3()
+  @NotNull
+  public final net.corda.core.node.services.Vault$StateStatus component4()
+  @Nullable
+  public final java.util.Set<Class<? extends net.corda.core.contracts.ContractState>> component5()
+  @NotNull
+  public final net.corda.core.node.services.vault.QueryCriteria$LinearStateQueryCriteria copy(java.util.List<? extends net.corda.core.identity.AbstractParty>, java.util.List<java.util.UUID>, java.util.List<String>, net.corda.core.node.services.Vault$StateStatus, java.util.Set<? extends Class<? extends net.corda.core.contracts.ContractState>>)
   public boolean equals(Object)
-  @org.jetbrains.annotations.Nullable public Set getContractStateTypes()
-  @org.jetbrains.annotations.Nullable public final List getExternalId()
-  @org.jetbrains.annotations.Nullable public final List getParticipants()
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.services.Vault$StateStatus getStatus()
-  @org.jetbrains.annotations.Nullable public final List getUuid()
+  @Nullable
+  public java.util.Set<Class<? extends net.corda.core.contracts.ContractState>> getContractStateTypes()
+  @Nullable
+  public final java.util.List<String> getExternalId()
+  @Nullable
+  public final java.util.List<net.corda.core.identity.AbstractParty> getParticipants()
+  @NotNull
+  public net.corda.core.node.services.Vault$StateStatus getStatus()
+  @Nullable
+  public final java.util.List<java.util.UUID> getUuid()
   public int hashCode()
   public String toString()
-  @org.jetbrains.annotations.NotNull public Collection visit(net.corda.core.node.services.vault.IQueryCriteriaParser)
+  @NotNull
+  public java.util.Collection<javax.persistence.criteria.Predicate> visit(net.corda.core.node.services.vault.IQueryCriteriaParser)
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.vault.QueryCriteria$OrComposition extends net.corda.core.node.services.vault.QueryCriteria implements net.corda.core.node.services.vault.GenericQueryCriteria$ChainableQueryCriteria$OrVisitor
+@CordaSerializable
+public static final class net.corda.core.node.services.vault.QueryCriteria$OrComposition extends net.corda.core.node.services.vault.QueryCriteria implements net.corda.core.node.services.vault.GenericQueryCriteria$ChainableQueryCriteria$OrVisitor
   public <init>(net.corda.core.node.services.vault.QueryCriteria, net.corda.core.node.services.vault.QueryCriteria)
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.services.vault.QueryCriteria getA()
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.services.vault.QueryCriteria getB()
-  @org.jetbrains.annotations.NotNull public Collection visit(net.corda.core.node.services.vault.IQueryCriteriaParser)
+  @NotNull
+  public net.corda.core.node.services.vault.QueryCriteria getA()
+  @NotNull
+  public net.corda.core.node.services.vault.QueryCriteria getB()
+  @NotNull
+  public java.util.Collection<javax.persistence.criteria.Predicate> visit(net.corda.core.node.services.vault.IQueryCriteriaParser)
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition extends java.lang.Object
-  public <init>(net.corda.core.node.services.vault.QueryCriteria$SoftLockingType, List)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.QueryCriteria$SoftLockingType component1()
-  @org.jetbrains.annotations.NotNull public final List component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition copy(net.corda.core.node.services.vault.QueryCriteria$SoftLockingType, List)
+@CordaSerializable
+public static final class net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition extends java.lang.Object
+  public <init>(net.corda.core.node.services.vault.QueryCriteria$SoftLockingType, java.util.List<java.util.UUID>)
+  @NotNull
+  public final net.corda.core.node.services.vault.QueryCriteria$SoftLockingType component1()
+  @NotNull
+  public final java.util.List<java.util.UUID> component2()
+  @NotNull
+  public final net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition copy(net.corda.core.node.services.vault.QueryCriteria$SoftLockingType, java.util.List<java.util.UUID>)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final List getLockIds()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.QueryCriteria$SoftLockingType getType()
+  @NotNull
+  public final java.util.List<java.util.UUID> getLockIds()
+  @NotNull
+  public final net.corda.core.node.services.vault.QueryCriteria$SoftLockingType getType()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.vault.QueryCriteria$SoftLockingType extends java.lang.Enum
-  protected <init>(String, int)
+@CordaSerializable
+public static final class net.corda.core.node.services.vault.QueryCriteria$SoftLockingType extends java.lang.Enum
+  protected <init>()
   public static net.corda.core.node.services.vault.QueryCriteria$SoftLockingType valueOf(String)
   public static net.corda.core.node.services.vault.QueryCriteria$SoftLockingType[] values()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.vault.QueryCriteria$TimeCondition extends java.lang.Object
-  public <init>(net.corda.core.node.services.vault.QueryCriteria$TimeInstantType, net.corda.core.node.services.vault.ColumnPredicate)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.QueryCriteria$TimeInstantType component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.ColumnPredicate component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.QueryCriteria$TimeCondition copy(net.corda.core.node.services.vault.QueryCriteria$TimeInstantType, net.corda.core.node.services.vault.ColumnPredicate)
+@CordaSerializable
+public static final class net.corda.core.node.services.vault.QueryCriteria$TimeCondition extends java.lang.Object
+  public <init>(net.corda.core.node.services.vault.QueryCriteria$TimeInstantType, net.corda.core.node.services.vault.ColumnPredicate<java.time.Instant>)
+  @NotNull
+  public final net.corda.core.node.services.vault.QueryCriteria$TimeInstantType component1()
+  @NotNull
+  public final net.corda.core.node.services.vault.ColumnPredicate<java.time.Instant> component2()
+  @NotNull
+  public final net.corda.core.node.services.vault.QueryCriteria$TimeCondition copy(net.corda.core.node.services.vault.QueryCriteria$TimeInstantType, net.corda.core.node.services.vault.ColumnPredicate<java.time.Instant>)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.ColumnPredicate getPredicate()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.QueryCriteria$TimeInstantType getType()
+  @NotNull
+  public final net.corda.core.node.services.vault.ColumnPredicate<java.time.Instant> getPredicate()
+  @NotNull
+  public final net.corda.core.node.services.vault.QueryCriteria$TimeInstantType getType()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.vault.QueryCriteria$TimeInstantType extends java.lang.Enum
-  protected <init>(String, int)
+@CordaSerializable
+public static final class net.corda.core.node.services.vault.QueryCriteria$TimeInstantType extends java.lang.Enum
+  protected <init>()
   public static net.corda.core.node.services.vault.QueryCriteria$TimeInstantType valueOf(String)
   public static net.corda.core.node.services.vault.QueryCriteria$TimeInstantType[] values()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.vault.QueryCriteria$VaultCustomQueryCriteria extends net.corda.core.node.services.vault.QueryCriteria$CommonQueryCriteria
-  public <init>(net.corda.core.node.services.vault.CriteriaExpression)
-  public <init>(net.corda.core.node.services.vault.CriteriaExpression, net.corda.core.node.services.Vault$StateStatus)
-  public <init>(net.corda.core.node.services.vault.CriteriaExpression, net.corda.core.node.services.Vault$StateStatus, Set)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.Vault$StateStatus component2()
-  @org.jetbrains.annotations.Nullable public final Set component3()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.QueryCriteria$VaultCustomQueryCriteria copy(net.corda.core.node.services.vault.CriteriaExpression, net.corda.core.node.services.Vault$StateStatus, Set)
+@CordaSerializable
+public static final class net.corda.core.node.services.vault.QueryCriteria$VaultCustomQueryCriteria extends net.corda.core.node.services.vault.QueryCriteria$CommonQueryCriteria
+  public <init>(net.corda.core.node.services.vault.CriteriaExpression<L, Boolean>)
+  public <init>(net.corda.core.node.services.vault.CriteriaExpression<L, Boolean>, net.corda.core.node.services.Vault$StateStatus)
+  public <init>(net.corda.core.node.services.vault.CriteriaExpression<L, Boolean>, net.corda.core.node.services.Vault$StateStatus, java.util.Set<? extends Class<? extends net.corda.core.contracts.ContractState>>)
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression<L, Boolean> component1()
+  @NotNull
+  public final net.corda.core.node.services.Vault$StateStatus component2()
+  @Nullable
+  public final java.util.Set<Class<? extends net.corda.core.contracts.ContractState>> component3()
+  @NotNull
+  public final net.corda.core.node.services.vault.QueryCriteria$VaultCustomQueryCriteria<L> copy(net.corda.core.node.services.vault.CriteriaExpression<L, Boolean>, net.corda.core.node.services.Vault$StateStatus, java.util.Set<? extends Class<? extends net.corda.core.contracts.ContractState>>)
   public boolean equals(Object)
-  @org.jetbrains.annotations.Nullable public Set getContractStateTypes()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.CriteriaExpression getExpression()
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.services.Vault$StateStatus getStatus()
+  @Nullable
+  public java.util.Set<Class<? extends net.corda.core.contracts.ContractState>> getContractStateTypes()
+  @NotNull
+  public final net.corda.core.node.services.vault.CriteriaExpression<L, Boolean> getExpression()
+  @NotNull
+  public net.corda.core.node.services.Vault$StateStatus getStatus()
   public int hashCode()
   public String toString()
-  @org.jetbrains.annotations.NotNull public Collection visit(net.corda.core.node.services.vault.IQueryCriteriaParser)
+  @NotNull
+  public java.util.Collection<javax.persistence.criteria.Predicate> visit(net.corda.core.node.services.vault.IQueryCriteriaParser)
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria extends net.corda.core.node.services.vault.QueryCriteria$CommonQueryCriteria
+@CordaSerializable
+public static final class net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria extends net.corda.core.node.services.vault.QueryCriteria$CommonQueryCriteria
   public <init>()
   public <init>(net.corda.core.node.services.Vault$StateStatus)
-  public <init>(net.corda.core.node.services.Vault$StateStatus, Set)
-  public <init>(net.corda.core.node.services.Vault$StateStatus, Set, List)
-  public <init>(net.corda.core.node.services.Vault$StateStatus, Set, List, List)
-  public <init>(net.corda.core.node.services.Vault$StateStatus, Set, List, List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition)
-  public <init>(net.corda.core.node.services.Vault$StateStatus, Set, List, List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.Vault$StateStatus component1()
-  @org.jetbrains.annotations.Nullable public final Set component2()
-  @org.jetbrains.annotations.Nullable public final List component3()
-  @org.jetbrains.annotations.Nullable public final List component4()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition component5()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.node.services.vault.QueryCriteria$TimeCondition component6()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria copy(net.corda.core.node.services.Vault$StateStatus, Set, List, List, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition)
+  public <init>(net.corda.core.node.services.Vault$StateStatus, java.util.Set<? extends Class<? extends net.corda.core.contracts.ContractState>>)
+  public <init>(net.corda.core.node.services.Vault$StateStatus, java.util.Set<? extends Class<? extends net.corda.core.contracts.ContractState>>, java.util.List<net.corda.core.contracts.StateRef>)
+  public <init>(net.corda.core.node.services.Vault$StateStatus, java.util.Set<? extends Class<? extends net.corda.core.contracts.ContractState>>, java.util.List<net.corda.core.contracts.StateRef>, java.util.List<? extends net.corda.core.identity.AbstractParty>)
+  public <init>(net.corda.core.node.services.Vault$StateStatus, java.util.Set<? extends Class<? extends net.corda.core.contracts.ContractState>>, java.util.List<net.corda.core.contracts.StateRef>, java.util.List<? extends net.corda.core.identity.AbstractParty>, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition)
+  public <init>(net.corda.core.node.services.Vault$StateStatus, java.util.Set<? extends Class<? extends net.corda.core.contracts.ContractState>>, java.util.List<net.corda.core.contracts.StateRef>, java.util.List<? extends net.corda.core.identity.AbstractParty>, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition)
+  @NotNull
+  public final net.corda.core.node.services.Vault$StateStatus component1()
+  @Nullable
+  public final java.util.Set<Class<? extends net.corda.core.contracts.ContractState>> component2()
+  @Nullable
+  public final java.util.List<net.corda.core.contracts.StateRef> component3()
+  @Nullable
+  public final java.util.List<net.corda.core.identity.AbstractParty> component4()
+  @Nullable
+  public final net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition component5()
+  @Nullable
+  public final net.corda.core.node.services.vault.QueryCriteria$TimeCondition component6()
+  @NotNull
+  public final net.corda.core.node.services.vault.QueryCriteria$VaultQueryCriteria copy(net.corda.core.node.services.Vault$StateStatus, java.util.Set<? extends Class<? extends net.corda.core.contracts.ContractState>>, java.util.List<net.corda.core.contracts.StateRef>, java.util.List<? extends net.corda.core.identity.AbstractParty>, net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition, net.corda.core.node.services.vault.QueryCriteria$TimeCondition)
   public boolean equals(Object)
-  @org.jetbrains.annotations.Nullable public Set getContractStateTypes()
-  @org.jetbrains.annotations.Nullable public final List getNotary()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition getSoftLockingCondition()
-  @org.jetbrains.annotations.Nullable public final List getStateRefs()
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.services.Vault$StateStatus getStatus()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.node.services.vault.QueryCriteria$TimeCondition getTimeCondition()
+  @Nullable
+  public java.util.Set<Class<? extends net.corda.core.contracts.ContractState>> getContractStateTypes()
+  @Nullable
+  public final java.util.List<net.corda.core.identity.AbstractParty> getNotary()
+  @Nullable
+  public final net.corda.core.node.services.vault.QueryCriteria$SoftLockingCondition getSoftLockingCondition()
+  @Nullable
+  public final java.util.List<net.corda.core.contracts.StateRef> getStateRefs()
+  @NotNull
+  public net.corda.core.node.services.Vault$StateStatus getStatus()
+  @Nullable
+  public final net.corda.core.node.services.vault.QueryCriteria$TimeCondition getTimeCondition()
   public int hashCode()
   public String toString()
-  @org.jetbrains.annotations.NotNull public Collection visit(net.corda.core.node.services.vault.IQueryCriteriaParser)
+  @NotNull
+  public java.util.Collection<javax.persistence.criteria.Predicate> visit(net.corda.core.node.services.vault.IQueryCriteriaParser)
 ##
 public final class net.corda.core.node.services.vault.QueryCriteriaUtils extends java.lang.Object
-  public static final Object builder(kotlin.jvm.functions.Function1)
-  @org.jetbrains.annotations.NotNull public static final String getColumnName(net.corda.core.node.services.vault.Column)
-  @org.jetbrains.annotations.NotNull public static final Class resolveEnclosingObjectFromColumn(net.corda.core.node.services.vault.Column)
-  @org.jetbrains.annotations.NotNull public static final Class resolveEnclosingObjectFromExpression(net.corda.core.node.services.vault.CriteriaExpression)
+  public static final A builder(kotlin.jvm.functions.Function1<? super net.corda.core.node.services.vault.Builder, ? extends A>)
+  @NotNull
+  public static final String getColumnName(net.corda.core.node.services.vault.Column<O, ? extends C>)
+  @NotNull
+  public static final Class<O> resolveEnclosingObjectFromColumn(net.corda.core.node.services.vault.Column<O, ? extends C>)
+  @NotNull
+  public static final Class<O> resolveEnclosingObjectFromExpression(net.corda.core.node.services.vault.CriteriaExpression<O, ? extends R>)
   public static final int DEFAULT_PAGE_NUM = 1
   public static final int DEFAULT_PAGE_SIZE = 200
   public static final int MAX_PAGE_SIZE = 2147483647
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.node.services.vault.Sort extends net.corda.core.node.services.vault.BaseSort
-  public <init>(Collection)
-  @org.jetbrains.annotations.NotNull public final Collection component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.Sort copy(Collection)
+@CordaSerializable
+public final class net.corda.core.node.services.vault.Sort extends net.corda.core.node.services.vault.BaseSort
+  public <init>(java.util.Collection<net.corda.core.node.services.vault.Sort$SortColumn>)
+  @NotNull
+  public final java.util.Collection<net.corda.core.node.services.vault.Sort$SortColumn> component1()
+  @NotNull
+  public final net.corda.core.node.services.vault.Sort copy(java.util.Collection<net.corda.core.node.services.vault.Sort$SortColumn>)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final Collection getColumns()
+  @NotNull
+  public final java.util.Collection<net.corda.core.node.services.vault.Sort$SortColumn> getColumns()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.DoNotImplement @net.corda.core.serialization.CordaSerializable public static interface net.corda.core.node.services.vault.Sort$Attribute
+@DoNotImplement
+@CordaSerializable
+public static interface net.corda.core.node.services.vault.Sort$Attribute
 ##
-@net.corda.core.DoNotImplement @net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.vault.Sort$CommonStateAttribute extends java.lang.Enum implements net.corda.core.node.services.vault.Sort$Attribute
-  protected <init>(String, int, String, String)
-  @org.jetbrains.annotations.Nullable public final String getAttributeChild()
-  @org.jetbrains.annotations.NotNull public final String getAttributeParent()
+@DoNotImplement
+@CordaSerializable
+public static final class net.corda.core.node.services.vault.Sort$CommonStateAttribute extends java.lang.Enum implements net.corda.core.node.services.vault.Sort$Attribute
+  protected <init>(String, String)
+  @Nullable
+  public final String getAttributeChild()
+  @NotNull
+  public final String getAttributeParent()
   public static net.corda.core.node.services.vault.Sort$CommonStateAttribute valueOf(String)
   public static net.corda.core.node.services.vault.Sort$CommonStateAttribute[] values()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.vault.Sort$Direction extends java.lang.Enum
-  protected <init>(String, int)
+@CordaSerializable
+public static final class net.corda.core.node.services.vault.Sort$Direction extends java.lang.Enum
+  protected <init>()
   public static net.corda.core.node.services.vault.Sort$Direction valueOf(String)
   public static net.corda.core.node.services.vault.Sort$Direction[] values()
 ##
-@net.corda.core.DoNotImplement @net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.vault.Sort$FungibleStateAttribute extends java.lang.Enum implements net.corda.core.node.services.vault.Sort$Attribute
-  protected <init>(String, int, String)
-  @org.jetbrains.annotations.NotNull public final String getAttributeName()
+@DoNotImplement
+@CordaSerializable
+public static final class net.corda.core.node.services.vault.Sort$FungibleStateAttribute extends java.lang.Enum implements net.corda.core.node.services.vault.Sort$Attribute
+  protected <init>(String)
+  @NotNull
+  public final String getAttributeName()
   public static net.corda.core.node.services.vault.Sort$FungibleStateAttribute valueOf(String)
   public static net.corda.core.node.services.vault.Sort$FungibleStateAttribute[] values()
 ##
-@net.corda.core.DoNotImplement @net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.vault.Sort$LinearStateAttribute extends java.lang.Enum implements net.corda.core.node.services.vault.Sort$Attribute
-  protected <init>(String, int, String)
-  @org.jetbrains.annotations.NotNull public final String getAttributeName()
+@DoNotImplement
+@CordaSerializable
+public static final class net.corda.core.node.services.vault.Sort$LinearStateAttribute extends java.lang.Enum implements net.corda.core.node.services.vault.Sort$Attribute
+  protected <init>(String)
+  @NotNull
+  public final String getAttributeName()
   public static net.corda.core.node.services.vault.Sort$LinearStateAttribute valueOf(String)
   public static net.corda.core.node.services.vault.Sort$LinearStateAttribute[] values()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.vault.Sort$SortColumn extends java.lang.Object
+@CordaSerializable
+public static final class net.corda.core.node.services.vault.Sort$SortColumn extends java.lang.Object
   public <init>(net.corda.core.node.services.vault.SortAttribute, net.corda.core.node.services.vault.Sort$Direction)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.SortAttribute component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.Sort$Direction component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.Sort$SortColumn copy(net.corda.core.node.services.vault.SortAttribute, net.corda.core.node.services.vault.Sort$Direction)
+  @NotNull
+  public final net.corda.core.node.services.vault.SortAttribute component1()
+  @NotNull
+  public final net.corda.core.node.services.vault.Sort$Direction component2()
+  @NotNull
+  public final net.corda.core.node.services.vault.Sort$SortColumn copy(net.corda.core.node.services.vault.SortAttribute, net.corda.core.node.services.vault.Sort$Direction)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.Sort$Direction getDirection()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.SortAttribute getSortAttribute()
+  @NotNull
+  public final net.corda.core.node.services.vault.Sort$Direction getDirection()
+  @NotNull
+  public final net.corda.core.node.services.vault.SortAttribute getSortAttribute()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.DoNotImplement @net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.vault.Sort$VaultStateAttribute extends java.lang.Enum implements net.corda.core.node.services.vault.Sort$Attribute
-  protected <init>(String, int, String)
-  @org.jetbrains.annotations.NotNull public final String getAttributeName()
+@DoNotImplement
+@CordaSerializable
+public static final class net.corda.core.node.services.vault.Sort$VaultStateAttribute extends java.lang.Enum implements net.corda.core.node.services.vault.Sort$Attribute
+  protected <init>(String)
+  @NotNull
+  public final String getAttributeName()
   public static net.corda.core.node.services.vault.Sort$VaultStateAttribute valueOf(String)
   public static net.corda.core.node.services.vault.Sort$VaultStateAttribute[] values()
 ##
-@net.corda.core.serialization.CordaSerializable public abstract class net.corda.core.node.services.vault.SortAttribute extends java.lang.Object
+@CordaSerializable
+public abstract class net.corda.core.node.services.vault.SortAttribute extends java.lang.Object
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.vault.SortAttribute$Custom extends net.corda.core.node.services.vault.SortAttribute
-  public <init>(Class, String)
-  @org.jetbrains.annotations.NotNull public final Class component1()
-  @org.jetbrains.annotations.NotNull public final String component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.SortAttribute$Custom copy(Class, String)
+@CordaSerializable
+public static final class net.corda.core.node.services.vault.SortAttribute$Custom extends net.corda.core.node.services.vault.SortAttribute
+  public <init>(Class<? extends net.corda.core.schemas.PersistentState>, String)
+  @NotNull
+  public final Class<? extends net.corda.core.schemas.PersistentState> component1()
+  @NotNull
+  public final String component2()
+  @NotNull
+  public final net.corda.core.node.services.vault.SortAttribute$Custom copy(Class<? extends net.corda.core.schemas.PersistentState>, String)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final Class getEntityStateClass()
-  @org.jetbrains.annotations.NotNull public final String getEntityStateColumnName()
+  @NotNull
+  public final Class<? extends net.corda.core.schemas.PersistentState> getEntityStateClass()
+  @NotNull
+  public final String getEntityStateColumnName()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.node.services.vault.SortAttribute$Standard extends net.corda.core.node.services.vault.SortAttribute
+@CordaSerializable
+public static final class net.corda.core.node.services.vault.SortAttribute$Standard extends net.corda.core.node.services.vault.SortAttribute
   public <init>(net.corda.core.node.services.vault.Sort$Attribute)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.Sort$Attribute component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.SortAttribute$Standard copy(net.corda.core.node.services.vault.Sort$Attribute)
+  @NotNull
+  public final net.corda.core.node.services.vault.Sort$Attribute component1()
+  @NotNull
+  public final net.corda.core.node.services.vault.SortAttribute$Standard copy(net.corda.core.node.services.vault.Sort$Attribute)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.vault.Sort$Attribute getAttribute()
+  @NotNull
+  public final net.corda.core.node.services.vault.Sort$Attribute getAttribute()
   public int hashCode()
   public String toString()
 ##
@@ -2759,30 +4265,41 @@ public final class net.corda.core.schemas.CommonSchemaV1 extends net.corda.core.
   @org.jetbrains.annotations.NotNull protected String getMigrationResource()
   public static final net.corda.core.schemas.CommonSchemaV1 INSTANCE
 ##
-@javax.persistence.MappedSuperclass @net.corda.core.serialization.CordaSerializable public static class net.corda.core.schemas.CommonSchemaV1$FungibleState extends net.corda.core.schemas.PersistentState
+@MappedSuperclass
+@CordaSerializable
+public static class net.corda.core.schemas.CommonSchemaV1$FungibleState extends net.corda.core.schemas.PersistentState
   public <init>()
-  public <init>(Set, net.corda.core.identity.AbstractParty, long, net.corda.core.identity.AbstractParty, byte[])
-  @org.jetbrains.annotations.NotNull public net.corda.core.identity.AbstractParty getIssuer()
-  @org.jetbrains.annotations.NotNull public byte[] getIssuerRef()
-  @org.jetbrains.annotations.NotNull public net.corda.core.identity.AbstractParty getOwner()
-  @org.jetbrains.annotations.Nullable public Set getParticipants()
+  public <init>(java.util.Set<net.corda.core.identity.AbstractParty>, net.corda.core.identity.AbstractParty, long, net.corda.core.identity.AbstractParty, byte[])
+  @NotNull
+  public net.corda.core.identity.AbstractParty getIssuer()
+  @NotNull
+  public byte[] getIssuerRef()
+  @NotNull
+  public net.corda.core.identity.AbstractParty getOwner()
+  @Nullable
+  public java.util.Set<net.corda.core.identity.AbstractParty> getParticipants()
   public long getQuantity()
   public void setIssuer(net.corda.core.identity.AbstractParty)
   public void setIssuerRef(byte[])
   public void setOwner(net.corda.core.identity.AbstractParty)
-  public void setParticipants(Set)
+  public void setParticipants(java.util.Set<net.corda.core.identity.AbstractParty>)
   public void setQuantity(long)
 ##
-@javax.persistence.MappedSuperclass @net.corda.core.serialization.CordaSerializable public static class net.corda.core.schemas.CommonSchemaV1$LinearState extends net.corda.core.schemas.PersistentState
+@MappedSuperclass
+@CordaSerializable
+public static class net.corda.core.schemas.CommonSchemaV1$LinearState extends net.corda.core.schemas.PersistentState
   public <init>()
-  public <init>(Set, String, UUID)
-  public <init>(net.corda.core.contracts.UniqueIdentifier, Set)
-  @org.jetbrains.annotations.Nullable public String getExternalId()
-  @org.jetbrains.annotations.Nullable public Set getParticipants()
-  @org.jetbrains.annotations.NotNull public UUID getUuid()
+  public <init>(java.util.Set<net.corda.core.identity.AbstractParty>, String, java.util.UUID)
+  public <init>(net.corda.core.contracts.UniqueIdentifier, java.util.Set<? extends net.corda.core.identity.AbstractParty>)
+  @Nullable
+  public String getExternalId()
+  @Nullable
+  public java.util.Set<net.corda.core.identity.AbstractParty> getParticipants()
+  @NotNull
+  public java.util.UUID getUuid()
   public void setExternalId(String)
-  public void setParticipants(Set)
-  public void setUuid(UUID)
+  public void setParticipants(java.util.Set<net.corda.core.identity.AbstractParty>)
+  public void setUuid(java.util.UUID)
 ##
 public class net.corda.core.schemas.MappedSchema extends java.lang.Object
   public <init>(Class, int, Iterable)
@@ -2790,37 +4307,53 @@ public class net.corda.core.schemas.MappedSchema extends java.lang.Object
   @org.jetbrains.annotations.Nullable protected String getMigrationResource()
   @org.jetbrains.annotations.NotNull public final String getName()
   public final int getVersion()
-  @org.jetbrains.annotations.NotNull public String toString()
+  @NotNull
+  public String toString()
 ##
-@javax.persistence.MappedSuperclass @net.corda.core.serialization.CordaSerializable public class net.corda.core.schemas.PersistentState extends java.lang.Object implements net.corda.core.schemas.StatePersistable
+@MappedSuperclass
+@CordaSerializable
+public class net.corda.core.schemas.PersistentState extends java.lang.Object implements net.corda.core.schemas.StatePersistable
   public <init>()
   public <init>(net.corda.core.schemas.PersistentStateRef)
-  @org.jetbrains.annotations.Nullable public net.corda.core.schemas.PersistentStateRef getStateRef()
+  @Nullable
+  public net.corda.core.schemas.PersistentStateRef getStateRef()
   public void setStateRef(net.corda.core.schemas.PersistentStateRef)
 ##
-@javax.persistence.Embeddable public class net.corda.core.schemas.PersistentStateRef extends java.lang.Object implements java.io.Serializable
+@Embeddable
+public class net.corda.core.schemas.PersistentStateRef extends java.lang.Object implements java.io.Serializable
   public <init>()
   public <init>(String, Integer)
   public <init>(net.corda.core.contracts.StateRef)
-  @org.jetbrains.annotations.Nullable public final String component1()
-  @org.jetbrains.annotations.Nullable public final Integer component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.schemas.PersistentStateRef copy(String, Integer)
+  @NullableCc
+  public final String component1()
+  @Nullable
+  public final Integer component2()
+  @NotNull
+  public final net.corda.core.schemas.PersistentStateRef copy(String, Integer)
   public boolean equals(Object)
-  @org.jetbrains.annotations.Nullable public Integer getIndex()
-  @org.jetbrains.annotations.Nullable public String getTxId()
+  @Nullable
+  public Integer getIndex()
+  @Nullable
+  public String getTxId()
   public int hashCode()
   public void setIndex(Integer)
   public void setTxId(String)
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public interface net.corda.core.schemas.QueryableState extends net.corda.core.contracts.ContractState
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.schemas.PersistentState generateMappedObject(net.corda.core.schemas.MappedSchema)
-  @org.jetbrains.annotations.NotNull public abstract Iterable supportedSchemas()
+@CordaSerializable
+public interface net.corda.core.schemas.QueryableState extends net.corda.core.contracts.ContractState
+  @NotNull
+  public abstract net.corda.core.schemas.PersistentState generateMappedObject(net.corda.core.schemas.MappedSchema)
+  @NotNull
+  public abstract Iterable<net.corda.core.schemas.MappedSchema> supportedSchemas()
+
+
+
 ##
 public interface net.corda.core.schemas.StatePersistable extends java.io.Serializable
 ##
 public interface net.corda.core.serialization.ClassWhitelist
-  public abstract boolean hasListed(Class)
+  public abstract boolean hasListed(Class<?>)
 ##
 public @interface net.corda.core.serialization.ConstructorForDeserialization
 ##
@@ -2843,414 +4376,655 @@ public @interface net.corda.core.serialization.CordaSerializationTransformRename
 public @interface net.corda.core.serialization.DeprecatedConstructorForDeserialization
   public abstract int version()
 ##
-@net.corda.core.DoNotImplement public interface net.corda.core.serialization.EncodingWhitelist
-  public abstract boolean acceptEncoding(net.corda.core.serialization.SerializationEncoding)
-##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.serialization.MissingAttachmentsException extends net.corda.core.CordaException
-  public <init>(List)
-  @org.jetbrains.annotations.NotNull public final List getIds()
+@CordaSerializable
+public final class net.corda.core.serialization.MissingAttachmentsException extends net.corda.core.CordaException
+  public <init>(java.util.List<? extends net.corda.core.crypto.SecureHash>)
+  @NotNull
+  public final java.util.List<net.corda.core.crypto.SecureHash> getIds()
 ##
 public final class net.corda.core.serialization.ObjectWithCompatibleContext extends java.lang.Object
-  public <init>(Object, net.corda.core.serialization.SerializationContext)
-  @org.jetbrains.annotations.NotNull public final Object component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.serialization.SerializationContext component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.serialization.ObjectWithCompatibleContext copy(Object, net.corda.core.serialization.SerializationContext)
+  public <init>(T, net.corda.core.serialization.SerializationContext)
+  @NotNull
+  public final T component1()
+  @NotNull
+  public final net.corda.core.serialization.SerializationContext component2()
+  @NotNull
+  public final net.corda.core.serialization.ObjectWithCompatibleContext<T> copy(T, net.corda.core.serialization.SerializationContext)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.serialization.SerializationContext getContext()
-  @org.jetbrains.annotations.NotNull public final Object getObj()
+  @NotNull
+  public final net.corda.core.serialization.SerializationContext getContext()
+  @NotNull
+  public final T getObj()
   public int hashCode()
   public String toString()
 ##
 public final class net.corda.core.serialization.SerializationAPIKt extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.serialization.SerializedBytes serialize(Object, net.corda.core.serialization.SerializationFactory, net.corda.core.serialization.SerializationContext)
+  @NotNull
+  public static final net.corda.core.serialization.SerializedBytes<T> serialize(T, net.corda.core.serialization.SerializationFactory, net.corda.core.serialization.SerializationContext)
 ##
-@net.corda.core.DoNotImplement public interface net.corda.core.serialization.SerializationContext
-  @org.jetbrains.annotations.NotNull public abstract ClassLoader getDeserializationClassLoader()
-  @org.jetbrains.annotations.Nullable public abstract net.corda.core.serialization.SerializationEncoding getEncoding()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.serialization.EncodingWhitelist getEncodingWhitelist()
+public interface net.corda.core.serialization.SerializationContext
+  @NotNull
+  public abstract ClassLoader getDeserializationClassLoader()
   public abstract boolean getObjectReferencesEnabled()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.utilities.ByteSequence getPreferredSerializationVersion()
-  @org.jetbrains.annotations.NotNull public abstract Map getProperties()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.serialization.SerializationContext$UseCase getUseCase()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.serialization.ClassWhitelist getWhitelist()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.serialization.SerializationContext withAttachmentsClassLoader(List)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.serialization.SerializationContext withClassLoader(ClassLoader)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.serialization.SerializationContext withEncoding(net.corda.core.serialization.SerializationEncoding)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.serialization.SerializationContext withPreferredSerializationVersion(net.corda.core.utilities.ByteSequence)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.serialization.SerializationContext withProperty(Object, Object)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.serialization.SerializationContext withWhitelisted(Class)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.serialization.SerializationContext withoutReferences()
+  @NotNull
+  public abstract net.corda.core.utilities.ByteSequence getPreferredSerializationVersion()
+  @NotNull
+  public abstract java.util.Map<Object, Object> getProperties()
+  @NotNull
+  public abstract net.corda.core.serialization.SerializationContext$UseCase getUseCase()
+  @NotNull
+  public abstract net.corda.core.serialization.ClassWhitelist getWhitelist()
+  @NotNull
+  public abstract net.corda.core.serialization.SerializationContext withAttachmentsClassLoader(java.util.List<? extends net.corda.core.crypto.SecureHash>)
+  @NotNull
+  public abstract net.corda.core.serialization.SerializationContext withClassLoader(ClassLoader)
+  @NotNull
+  public abstract net.corda.core.serialization.SerializationContext withPreferredSerializationVersion(net.corda.core.utilities.ByteSequence)
+  @NotNull
+  public abstract net.corda.core.serialization.SerializationContext withProperty(Object, Object)
+  @NotNull
+  public abstract net.corda.core.serialization.SerializationContext withWhitelisted(Class<?>)
+  @NotNull
+  public abstract net.corda.core.serialization.SerializationContext withoutReferences()
 ##
 public static final class net.corda.core.serialization.SerializationContext$UseCase extends java.lang.Enum
-  protected <init>(String, int)
+  protected <init>()
   public static net.corda.core.serialization.SerializationContext$UseCase valueOf(String)
   public static net.corda.core.serialization.SerializationContext$UseCase[] values()
 ##
 public interface net.corda.core.serialization.SerializationCustomSerializer
-  public abstract Object fromProxy(Object)
-  public abstract Object toProxy(Object)
+  public abstract OBJ fromProxy(PROXY)
+  public abstract PROXY toProxy(OBJ)
 ##
 public final class net.corda.core.serialization.SerializationDefaults extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.serialization.SerializationContext getCHECKPOINT_CONTEXT()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.serialization.SerializationContext getP2P_CONTEXT()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.serialization.SerializationContext getRPC_CLIENT_CONTEXT()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.serialization.SerializationContext getRPC_SERVER_CONTEXT()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.serialization.SerializationFactory getSERIALIZATION_FACTORY()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.serialization.SerializationContext getSTORAGE_CONTEXT()
+  @NotNull
+  public final net.corda.core.serialization.SerializationContext getCHECKPOINT_CONTEXT()
+  @NotNull
+  public final net.corda.core.serialization.SerializationContext getP2P_CONTEXT()
+  @NotNull
+  public final net.corda.core.serialization.SerializationContext getRPC_CLIENT_CONTEXT()
+  @NotNull
+  public final net.corda.core.serialization.SerializationContext getRPC_SERVER_CONTEXT()
+  @NotNull
+  public final net.corda.core.serialization.SerializationFactory getSERIALIZATION_FACTORY()
+  @NotNull
+  public final net.corda.core.serialization.SerializationContext getSTORAGE_CONTEXT()
   public static final net.corda.core.serialization.SerializationDefaults INSTANCE
 ##
-@net.corda.core.DoNotImplement public interface net.corda.core.serialization.SerializationEncoding
-##
 public abstract class net.corda.core.serialization.SerializationFactory extends java.lang.Object
   public <init>()
-  public final Object asCurrent(kotlin.jvm.functions.Function1)
-  @org.jetbrains.annotations.NotNull public abstract Object deserialize(net.corda.core.utilities.ByteSequence, Class, net.corda.core.serialization.SerializationContext)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.serialization.ObjectWithCompatibleContext deserializeWithCompatibleContext(net.corda.core.utilities.ByteSequence, Class, net.corda.core.serialization.SerializationContext)
-  @org.jetbrains.annotations.Nullable public final net.corda.core.serialization.SerializationContext getCurrentContext()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.serialization.SerializationContext getDefaultContext()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.serialization.SerializedBytes serialize(Object, net.corda.core.serialization.SerializationContext)
-  public final Object withCurrentContext(net.corda.core.serialization.SerializationContext, kotlin.jvm.functions.Function0)
+  public final T asCurrent(kotlin.jvm.functions.Function1<? super net.corda.core.serialization.SerializationFactory, ? extends T>)
+  @NotNull
+  public abstract T deserialize(net.corda.core.utilities.ByteSequence, Class<T>, net.corda.core.serialization.SerializationContext)
+  @NotNull
+  public abstract net.corda.core.serialization.ObjectWithCompatibleContext<T> deserializeWithCompatibleContext(net.corda.core.utilities.ByteSequence, Class<T>, net.corda.core.serialization.SerializationContext)
+  @Nullable
+  public final net.corda.core.serialization.SerializationContext getCurrentContext()
+  @NotNull
+  public final net.corda.core.serialization.SerializationContext getDefaultContext()
+  @NotNull
+  public abstract net.corda.core.serialization.SerializedBytes<T> serialize(T, net.corda.core.serialization.SerializationContext)
+  public final T withCurrentContext(net.corda.core.serialization.SerializationContext, kotlin.jvm.functions.Function0<? extends T>)
   public static final net.corda.core.serialization.SerializationFactory$Companion Companion
 ##
 public static final class net.corda.core.serialization.SerializationFactory$Companion extends java.lang.Object
-  @org.jetbrains.annotations.Nullable public final net.corda.core.serialization.SerializationFactory getCurrentFactory()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.serialization.SerializationFactory getDefaultFactory()
+  @Nullable
+  public final net.corda.core.serialization.SerializationFactory getCurrentFactory()
+  @NotNull
+  public final net.corda.core.serialization.SerializationFactory getDefaultFactory()
 ##
 public interface net.corda.core.serialization.SerializationToken
-  @org.jetbrains.annotations.NotNull public abstract Object fromToken(net.corda.core.serialization.SerializeAsTokenContext)
+  @NotNull
+  public abstract Object fromToken(net.corda.core.serialization.SerializeAsTokenContext)
 ##
 public interface net.corda.core.serialization.SerializationWhitelist
-  @org.jetbrains.annotations.NotNull public abstract List getWhitelist()
+  @NotNull
+  public abstract java.util.List<Class<?>> getWhitelist()
 ##
-@net.corda.core.serialization.CordaSerializable public interface net.corda.core.serialization.SerializeAsToken
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.serialization.SerializationToken toToken(net.corda.core.serialization.SerializeAsTokenContext)
+@CordaSerializable
+public interface net.corda.core.serialization.SerializeAsToken
+  @NotNull
+  public abstract net.corda.core.serialization.SerializationToken toToken(net.corda.core.serialization.SerializeAsTokenContext)
 ##
 public interface net.corda.core.serialization.SerializeAsTokenContext
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.node.ServiceHub getServiceHub()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.serialization.SerializeAsToken getSingleton(String)
+  @NotNull
+  public abstract net.corda.core.node.ServiceHub getServiceHub()
+  @NotNull
+  public abstract net.corda.core.serialization.SerializeAsToken getSingleton(String)
   public abstract void putSingleton(net.corda.core.serialization.SerializeAsToken)
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.serialization.SerializedBytes extends net.corda.core.utilities.OpaqueBytes
+@CordaSerializable
+public final class net.corda.core.serialization.SerializedBytes extends net.corda.core.utilities.OpaqueBytes
   public <init>(byte[])
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash getHash()
+  @NotNull
+  public final net.corda.core.crypto.SecureHash getHash()
 ##
 public final class net.corda.core.serialization.SingletonSerializationToken extends java.lang.Object implements net.corda.core.serialization.SerializationToken
-  @org.jetbrains.annotations.NotNull public net.corda.core.serialization.SerializeAsToken fromToken(net.corda.core.serialization.SerializeAsTokenContext)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.serialization.SingletonSerializationToken registerWithContext(net.corda.core.serialization.SerializeAsTokenContext, net.corda.core.serialization.SerializeAsToken)
+  @NotNull
+  public net.corda.core.serialization.SerializeAsToken fromToken(net.corda.core.serialization.SerializeAsTokenContext)
+  @NotNull
+  public final net.corda.core.serialization.SingletonSerializationToken registerWithContext(net.corda.core.serialization.SerializeAsTokenContext, net.corda.core.serialization.SerializeAsToken)
   public static final net.corda.core.serialization.SingletonSerializationToken$Companion Companion
 ##
 public static final class net.corda.core.serialization.SingletonSerializationToken$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.serialization.SingletonSerializationToken singletonSerializationToken(Class)
+  @NotNull
+  public final net.corda.core.serialization.SingletonSerializationToken singletonSerializationToken(Class<T>)
 ##
-@net.corda.core.serialization.CordaSerializable public abstract class net.corda.core.serialization.SingletonSerializeAsToken extends java.lang.Object implements net.corda.core.serialization.SerializeAsToken
+@CordaSerializable
+public abstract class net.corda.core.serialization.SingletonSerializeAsToken extends java.lang.Object implements net.corda.core.serialization.SerializeAsToken
   public <init>()
-  @org.jetbrains.annotations.NotNull public net.corda.core.serialization.SingletonSerializationToken toToken(net.corda.core.serialization.SerializeAsTokenContext)
+  @NotNull
+  public net.corda.core.serialization.SingletonSerializationToken toToken(net.corda.core.serialization.SerializeAsTokenContext)
 ##
-@net.corda.core.DoNotImplement public abstract class net.corda.core.transactions.BaseTransaction extends java.lang.Object implements net.corda.core.contracts.NamedByHash
+@DoNotImplement
+public abstract class net.corda.core.transactions.BaseTransaction extends java.lang.Object implements net.corda.core.contracts.NamedByHash
   public <init>()
   protected void checkBaseInvariants()
-  @org.jetbrains.annotations.NotNull public final List filterOutRefs(Class, function.Predicate)
-  @org.jetbrains.annotations.NotNull public final List filterOutputs(Class, function.Predicate)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.StateAndRef findOutRef(Class, function.Predicate)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.ContractState findOutput(Class, function.Predicate)
-  @org.jetbrains.annotations.NotNull public abstract List getInputs()
-  @org.jetbrains.annotations.Nullable public abstract net.corda.core.identity.Party getNotary()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.ContractState getOutput(int)
-  @org.jetbrains.annotations.NotNull public final List getOutputStates()
-  @org.jetbrains.annotations.NotNull public abstract List getOutputs()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.StateAndRef outRef(int)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.StateAndRef outRef(net.corda.core.contracts.ContractState)
-  @org.jetbrains.annotations.NotNull public final List outRefsOfType(Class)
-  @org.jetbrains.annotations.NotNull public final List outputsOfType(Class)
-  @org.jetbrains.annotations.NotNull public String toString()
+  @NotNull
+  public final java.util.List<net.corda.core.contracts.StateAndRef<T>> filterOutRefs(Class<T>, java.util.function.Predicate<T>)
+  @NotNull
+  public final java.util.List<T> filterOutputs(Class<T>, java.util.function.Predicate<T>)
+  @NotNull
+  public final net.corda.core.contracts.StateAndRef<T> findOutRef(Class<T>, java.util.function.Predicate<T>)
+  @NotNull
+  public final T findOutput(Class<T>, java.util.function.Predicate<T>)
+  @NotNull
+  public abstract java.util.List<?> getInputs()
+  @Nullable
+  public abstract net.corda.core.identity.Party getNotary()
+  @NotNull
+  public final net.corda.core.contracts.ContractState getOutput(int)
+  @NotNull
+  public final java.util.List<net.corda.core.contracts.ContractState> getOutputStates()
+  @NotNull
+  public abstract java.util.List<net.corda.core.contracts.TransactionState<net.corda.core.contracts.ContractState>> getOutputs()
+  @NotNull
+  public final net.corda.core.contracts.StateAndRef<T> outRef(int)
+  @NotNull
+  public final net.corda.core.contracts.StateAndRef<T> outRef(net.corda.core.contracts.ContractState)
+  @NotNull
+  public final java.util.List<net.corda.core.contracts.StateAndRef<T>> outRefsOfType(Class<T>)
+  @NotNull
+  public final java.util.List<T> outputsOfType(Class<T>)
+  @NotNull
+  public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public class net.corda.core.transactions.ComponentGroup extends java.lang.Object
-  public <init>(int, List)
-  @org.jetbrains.annotations.NotNull public List getComponents()
+@CordaSerializable
+public class net.corda.core.transactions.ComponentGroup extends java.lang.Object
+  public <init>(int, java.util.List<? extends net.corda.core.utilities.OpaqueBytes>)
+  @NotNull
+  public java.util.List<net.corda.core.utilities.OpaqueBytes> getComponents()
   public int getGroupIndex()
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.transactions.ComponentVisibilityException extends net.corda.core.CordaException
+@CordaSerializable
+public final class net.corda.core.transactions.ComponentVisibilityException extends net.corda.core.CordaException
   public <init>(net.corda.core.crypto.SecureHash, String)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash getId()
-  @org.jetbrains.annotations.NotNull public final String getReason()
+  @NotNull
+  public final net.corda.core.crypto.SecureHash getId()
+  @NotNull
+  public final String getReason()
 ##
-@net.corda.core.DoNotImplement @net.corda.core.serialization.CordaSerializable public final class net.corda.core.transactions.ContractUpgradeFilteredTransaction extends net.corda.core.transactions.CoreTransaction
-  public <init>(Map, Map)
-  @org.jetbrains.annotations.NotNull public final Map component1()
-  @org.jetbrains.annotations.NotNull public final Map component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.ContractUpgradeFilteredTransaction copy(Map, Map)
+@DoNotImplement
+@CordaSerializable
+public final class net.corda.core.transactions.ContractUpgradeFilteredTransaction extends net.corda.core.transactions.CoreTransaction
+  public <init>(java.util.Map<Integer, net.corda.core.transactions.ContractUpgradeFilteredTransaction$FilteredComponent>, java.util.Map<Integer, ? extends net.corda.core.crypto.SecureHash>)
+  @NotNull
+  public final java.util.Map<Integer, net.corda.core.transactions.ContractUpgradeFilteredTransaction$FilteredComponent> component1()
+  @NotNull
+  public final java.util.Map<Integer, net.corda.core.crypto.SecureHash> component2()
+  @NotNull
+  public final net.corda.core.transactions.ContractUpgradeFilteredTransaction copy(java.util.Map<Integer, net.corda.core.transactions.ContractUpgradeFilteredTransaction$FilteredComponent>, java.util.Map<Integer, ? extends net.corda.core.crypto.SecureHash>)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final Map getHiddenComponents()
-  @org.jetbrains.annotations.NotNull public net.corda.core.crypto.SecureHash getId()
-  @org.jetbrains.annotations.NotNull public List getInputs()
-  @org.jetbrains.annotations.NotNull public net.corda.core.identity.Party getNotary()
-  @org.jetbrains.annotations.NotNull public List getOutputs()
-  @org.jetbrains.annotations.NotNull public final Map getVisibleComponents()
+  @NotNull
+  public final java.util.Map<Integer, net.corda.core.crypto.SecureHash> getHiddenComponents()
+  @NotNull
+  public net.corda.core.crypto.SecureHash getId()
+  @NotNull
+  public java.util.List<net.corda.core.contracts.StateRef> getInputs()
+  @NotNull
+  public net.corda.core.identity.Party getNotary()
+  @NotNull
+  public java.util.List<net.corda.core.contracts.TransactionState<net.corda.core.contracts.ContractState>> getOutputs()
+  @NotNull
+  public final java.util.Map<Integer, net.corda.core.transactions.ContractUpgradeFilteredTransaction$FilteredComponent> getVisibleComponents()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.transactions.ContractUpgradeFilteredTransaction$FilteredComponent extends java.lang.Object
+@CordaSerializable
+public static final class net.corda.core.transactions.ContractUpgradeFilteredTransaction$FilteredComponent extends java.lang.Object
   public <init>(net.corda.core.utilities.OpaqueBytes, net.corda.core.crypto.SecureHash)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.OpaqueBytes getComponent()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash getNonce()
+  @NotNull
+  public final net.corda.core.utilities.OpaqueBytes getComponent()
+  @NotNull
+  public final net.corda.core.crypto.SecureHash getNonce()
 ##
-@net.corda.core.DoNotImplement public final class net.corda.core.transactions.ContractUpgradeLedgerTransaction extends net.corda.core.transactions.FullTransaction implements net.corda.core.transactions.TransactionWithSignatures
-  public <init>(List, net.corda.core.identity.Party, net.corda.core.contracts.Attachment, String, net.corda.core.contracts.Attachment, net.corda.core.crypto.SecureHash, net.corda.core.contracts.PrivacySalt, List, net.corda.core.node.NetworkParameters)
+@DoNotImplement
+public final class net.corda.core.transactions.ContractUpgradeLedgerTransaction extends net.corda.core.transactions.FullTransaction implements net.corda.core.transactions.TransactionWithSignatures
+  public <init>(java.util.List<? extends net.corda.core.contracts.StateAndRef<? extends net.corda.core.contracts.ContractState>>, net.corda.core.identity.Party, net.corda.core.contracts.Attachment, String, net.corda.core.contracts.Attachment, net.corda.core.crypto.SecureHash, net.corda.core.contracts.PrivacySalt, java.util.List<net.corda.core.crypto.TransactionSignature>, net.corda.core.node.NetworkParameters)
   public void checkSignaturesAreValid()
-  @org.jetbrains.annotations.NotNull public final List component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.Party component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.Attachment component3()
-  @org.jetbrains.annotations.NotNull public final String component4()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.Attachment component5()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash component6()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.PrivacySalt component7()
-  @org.jetbrains.annotations.NotNull public final List component8()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.ContractUpgradeLedgerTransaction copy(List, net.corda.core.identity.Party, net.corda.core.contracts.Attachment, String, net.corda.core.contracts.Attachment, net.corda.core.crypto.SecureHash, net.corda.core.contracts.PrivacySalt, List, net.corda.core.node.NetworkParameters)
+  @NotNull
+  public final java.util.List<net.corda.core.contracts.StateAndRef<net.corda.core.contracts.ContractState>> component1()
+  @NotNull
+  public final net.corda.core.identity.Party component2()
+  @NotNull
+  public final net.corda.core.contracts.Attachment component3()
+  @NotNull
+  public final String component4()
+  @NotNull
+  public final net.corda.core.contracts.Attachment component5()
+  @NotNull
+  public final net.corda.core.crypto.SecureHash component6()
+  @NotNull
+  public final net.corda.core.contracts.PrivacySalt component7()
+  @NotNull
+  public final java.util.List<net.corda.core.crypto.TransactionSignature> component8()
+  @NotNull
+  public final net.corda.core.transactions.ContractUpgradeLedgerTransaction copy(java.util.List<? extends net.corda.core.contracts.StateAndRef<? extends net.corda.core.contracts.ContractState>>, net.corda.core.identity.Party, net.corda.core.contracts.Attachment, String, net.corda.core.contracts.Attachment, net.corda.core.crypto.SecureHash, net.corda.core.contracts.PrivacySalt, java.util.List<net.corda.core.crypto.TransactionSignature>, net.corda.core.node.NetworkParameters)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public net.corda.core.crypto.SecureHash getId()
-  @org.jetbrains.annotations.NotNull public List getInputs()
-  @org.jetbrains.annotations.NotNull public List getKeyDescriptions(Set)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.Attachment getLegacyContractAttachment()
-  @org.jetbrains.annotations.NotNull public Set getMissingSigners()
-  @org.jetbrains.annotations.NotNull public net.corda.core.identity.Party getNotary()
-  @org.jetbrains.annotations.NotNull public List getOutputs()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.PrivacySalt getPrivacySalt()
-  @org.jetbrains.annotations.NotNull public Set getRequiredSigningKeys()
-  @org.jetbrains.annotations.NotNull public List getSigs()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.Attachment getUpgradedContractAttachment()
-  @org.jetbrains.annotations.NotNull public final String getUpgradedContractClassName()
+  @NotNull
+  public net.corda.core.crypto.SecureHash getId()
+  @NotNull
+  public java.util.List<net.corda.core.contracts.StateAndRef<net.corda.core.contracts.ContractState>> getInputs()
+  @NotNull
+  public java.util.List<String> getKeyDescriptions(java.util.Set<? extends java.security.PublicKey>)
+  @NotNull
+  public final net.corda.core.contracts.Attachment getLegacyContractAttachment()
+  @NotNull
+  public java.util.Set<java.security.PublicKey> getMissingSigners()
+  @NotNull
+  public net.corda.core.identity.Party getNotary()
+  @NotNull
+  public java.util.List<net.corda.core.contracts.TransactionState<net.corda.core.contracts.ContractState>> getOutputs()
+  @NotNull
+  public final net.corda.core.contracts.PrivacySalt getPrivacySalt()
+  @NotNull
+  public java.util.Set<java.security.PublicKey> getRequiredSigningKeys()
+  @NotNull
+  public java.util.List<net.corda.core.crypto.TransactionSignature> getSigs()
+  @NotNull
+  public final net.corda.core.contracts.Attachment getUpgradedContractAttachment()
+  @NotNull
+  public final String getUpgradedContractClassName()
   public int hashCode()
   public String toString()
   public void verifyRequiredSignatures()
-  public void verifySignaturesExcept(Collection)
+  public void verifySignaturesExcept(java.util.Collection<? extends java.security.PublicKey>)
   public void verifySignaturesExcept(java.security.PublicKey...)
 ##
-@net.corda.core.DoNotImplement @net.corda.core.serialization.CordaSerializable public final class net.corda.core.transactions.ContractUpgradeWireTransaction extends net.corda.core.transactions.CoreTransaction
-  public <init>(List, net.corda.core.contracts.PrivacySalt)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.ContractUpgradeFilteredTransaction buildFilteredTransaction()
-  @org.jetbrains.annotations.NotNull public final List component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.PrivacySalt component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.ContractUpgradeWireTransaction copy(List, net.corda.core.contracts.PrivacySalt)
+@DoNotImplement
+@CordaSerializable
+public final class net.corda.core.transactions.ContractUpgradeWireTransaction extends net.corda.core.transactions.CoreTransaction
+  public <init>(java.util.List<? extends net.corda.core.utilities.OpaqueBytes>, net.corda.core.contracts.PrivacySalt)
+  @NotNull
+  public final net.corda.core.transactions.ContractUpgradeFilteredTransaction buildFilteredTransaction()
+  @NotNull
+  public final java.util.List<net.corda.core.utilities.OpaqueBytes> component1()
+  @NotNull
+  public final net.corda.core.contracts.PrivacySalt component2()
+  @NotNull
+  public final net.corda.core.transactions.ContractUpgradeWireTransaction copy(java.util.List<? extends net.corda.core.utilities.OpaqueBytes>, net.corda.core.contracts.PrivacySalt)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public net.corda.core.crypto.SecureHash getId()
-  @org.jetbrains.annotations.NotNull public List getInputs()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash getLegacyContractAttachmentId()
-  @org.jetbrains.annotations.NotNull public net.corda.core.identity.Party getNotary()
-  @org.jetbrains.annotations.NotNull public List getOutputs()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.PrivacySalt getPrivacySalt()
-  @org.jetbrains.annotations.NotNull public final List getSerializedComponents()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash getUpgradedContractAttachmentId()
-  @org.jetbrains.annotations.NotNull public final String getUpgradedContractClassName()
+  @NotNull
+  public net.corda.core.crypto.SecureHash getId()
+  @NotNull
+  public java.util.List<net.corda.core.contracts.StateRef> getInputs()
+  @NotNull
+  public final net.corda.core.crypto.SecureHash getLegacyContractAttachmentId()
+  @NotNull
+  public net.corda.core.identity.Party getNotary()
+  @NotNull
+  public java.util.List<net.corda.core.contracts.TransactionState<net.corda.core.contracts.ContractState>> getOutputs()
+  @NotNull
+  public final net.corda.core.contracts.PrivacySalt getPrivacySalt()
+  @NotNull
+  public final java.util.List<net.corda.core.utilities.OpaqueBytes> getSerializedComponents()
+  @NotNull
+  public final net.corda.core.crypto.SecureHash getUpgradedContractAttachmentId()
+  @NotNull
+  public final String getUpgradedContractClassName()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.ContractUpgradeLedgerTransaction resolve(net.corda.core.node.ServicesForResolution, List)
+  @NotNull
+  public final net.corda.core.transactions.ContractUpgradeLedgerTransaction resolve(net.corda.core.node.ServicesForResolution, java.util.List<net.corda.core.crypto.TransactionSignature>)
   public String toString()
 ##
 public static final class net.corda.core.transactions.ContractUpgradeWireTransaction$Component extends java.lang.Enum
-  protected <init>(String, int)
+  protected <init>()
   public static net.corda.core.transactions.ContractUpgradeWireTransaction$Component valueOf(String)
   public static net.corda.core.transactions.ContractUpgradeWireTransaction$Component[] values()
 ##
-@net.corda.core.DoNotImplement @net.corda.core.serialization.CordaSerializable public abstract class net.corda.core.transactions.CoreTransaction extends net.corda.core.transactions.BaseTransaction
+@DoNotImplement
+@CordaSerializable
+public abstract class net.corda.core.transactions.CoreTransaction extends net.corda.core.transactions.BaseTransaction
   public <init>()
-  @org.jetbrains.annotations.NotNull public abstract List getInputs()
+  @NotNull
+  public abstract java.util.List<net.corda.core.contracts.StateRef> getInputs()
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.transactions.FilteredComponentGroup extends net.corda.core.transactions.ComponentGroup
-  public <init>(int, List, List, net.corda.core.crypto.PartialMerkleTree)
+@CordaSerializable
+public final class net.corda.core.transactions.FilteredComponentGroup extends net.corda.core.transactions.ComponentGroup
+  public <init>(int, java.util.List<? extends net.corda.core.utilities.OpaqueBytes>, java.util.List<? extends net.corda.core.crypto.SecureHash>, net.corda.core.crypto.PartialMerkleTree)
   public final int component1()
-  @org.jetbrains.annotations.NotNull public final List component2()
-  @org.jetbrains.annotations.NotNull public final List component3()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.PartialMerkleTree component4()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.FilteredComponentGroup copy(int, List, List, net.corda.core.crypto.PartialMerkleTree)
+  @NotNull
+  public final java.util.List<net.corda.core.utilities.OpaqueBytes> component2()
+  @NotNull
+  public final java.util.List<net.corda.core.crypto.SecureHash> component3()
+  @NotNull
+  public final net.corda.core.crypto.PartialMerkleTree component4()
+  @NotNull
+  public final net.corda.core.transactions.FilteredComponentGroup copy(int, java.util.List<? extends net.corda.core.utilities.OpaqueBytes>, java.util.List<? extends net.corda.core.crypto.SecureHash>, net.corda.core.crypto.PartialMerkleTree)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public List getComponents()
+  @NotNull
+  public java.util.List<net.corda.core.utilities.OpaqueBytes> getComponents()
   public int getGroupIndex()
-  @org.jetbrains.annotations.NotNull public final List getNonces()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.PartialMerkleTree getPartialMerkleTree()
+  @NotNull
+  public final java.util.List<net.corda.core.crypto.SecureHash> getNonces()
+  @NotNull
+  public final net.corda.core.crypto.PartialMerkleTree getPartialMerkleTree()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.DoNotImplement @net.corda.core.serialization.CordaSerializable public final class net.corda.core.transactions.FilteredTransaction extends net.corda.core.transactions.TraversableTransaction
-  public <init>(net.corda.core.crypto.SecureHash, List, List)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.transactions.FilteredTransaction buildFilteredTransaction(net.corda.core.transactions.WireTransaction, function.Predicate)
+@DoNotImplement
+@CordaSerializable
+public final class net.corda.core.transactions.FilteredTransaction extends net.corda.core.transactions.TraversableTransaction
+  public <init>(net.corda.core.crypto.SecureHash, java.util.List<net.corda.core.transactions.FilteredComponentGroup>, java.util.List<? extends net.corda.core.crypto.SecureHash>)
+  @NotNull
+  public static final net.corda.core.transactions.FilteredTransaction buildFilteredTransaction(net.corda.core.transactions.WireTransaction, java.util.function.Predicate<Object>)
   public final void checkAllComponentsVisible(net.corda.core.contracts.ComponentGroupEnum)
   public final void checkCommandVisibility(java.security.PublicKey)
-  public final boolean checkWithFun(kotlin.jvm.functions.Function1)
-  @org.jetbrains.annotations.NotNull public final List getFilteredComponentGroups()
-  @org.jetbrains.annotations.NotNull public final List getGroupHashes()
-  @org.jetbrains.annotations.NotNull public net.corda.core.crypto.SecureHash getId()
+  public final boolean checkWithFun(kotlin.jvm.functions.Function1<Object, Boolean>)
+  @NotNull
+  public final java.util.List<net.corda.core.transactions.FilteredComponentGroup> getFilteredComponentGroups()
+  @NotNull
+  public final java.util.List<net.corda.core.crypto.SecureHash> getGroupHashes()
+  @NotNull
+  public net.corda.core.crypto.SecureHash getId()
   public final void verify()
   public static final net.corda.core.transactions.FilteredTransaction$Companion Companion
 ##
 public static final class net.corda.core.transactions.FilteredTransaction$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.FilteredTransaction buildFilteredTransaction(net.corda.core.transactions.WireTransaction, function.Predicate)
+  @NotNull
+  public final net.corda.core.transactions.FilteredTransaction buildFilteredTransaction(net.corda.core.transactions.WireTransaction, java.util.function.Predicate<Object>)
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.transactions.FilteredTransactionVerificationException extends net.corda.core.CordaException
+@CordaSerializable
+public final class net.corda.core.transactions.FilteredTransactionVerificationException extends net.corda.core.CordaException
   public <init>(net.corda.core.crypto.SecureHash, String)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash getId()
-  @org.jetbrains.annotations.NotNull public final String getReason()
+  @NotNull
+  public final net.corda.core.crypto.SecureHash getId()
+  @NotNull
+  public final String getReason()
 ##
-@net.corda.core.DoNotImplement public abstract class net.corda.core.transactions.FullTransaction extends net.corda.core.transactions.BaseTransaction
+@DoNotImplement
+public abstract class net.corda.core.transactions.FullTransaction extends net.corda.core.transactions.BaseTransaction
   public <init>()
   protected void checkBaseInvariants()
-  @org.jetbrains.annotations.NotNull public abstract List getInputs()
+  @NotNull
+  public abstract java.util.List<net.corda.core.contracts.StateAndRef<net.corda.core.contracts.ContractState>> getInputs()
 ##
-@net.corda.core.DoNotImplement @net.corda.core.serialization.CordaSerializable public final class net.corda.core.transactions.LedgerTransaction extends net.corda.core.transactions.FullTransaction
-  public <init>(List, List, List, List, net.corda.core.crypto.SecureHash, net.corda.core.identity.Party, net.corda.core.contracts.TimeWindow, net.corda.core.contracts.PrivacySalt)
-  public <init>(List, List, List, List, net.corda.core.crypto.SecureHash, net.corda.core.identity.Party, net.corda.core.contracts.TimeWindow, net.corda.core.contracts.PrivacySalt, net.corda.core.node.NetworkParameters)
-  @org.jetbrains.annotations.NotNull public final List commandsOfType(Class)
-  @org.jetbrains.annotations.NotNull public final List component1()
-  @org.jetbrains.annotations.NotNull public final List component2()
-  @org.jetbrains.annotations.NotNull public final List component3()
-  @org.jetbrains.annotations.NotNull public final List component4()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash component5()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.identity.Party component6()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.contracts.TimeWindow component7()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.PrivacySalt component8()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.LedgerTransaction copy(List, List, List, List, net.corda.core.crypto.SecureHash, net.corda.core.identity.Party, net.corda.core.contracts.TimeWindow, net.corda.core.contracts.PrivacySalt)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.LedgerTransaction copy(List, List, List, List, net.corda.core.crypto.SecureHash, net.corda.core.identity.Party, net.corda.core.contracts.TimeWindow, net.corda.core.contracts.PrivacySalt, net.corda.core.node.NetworkParameters)
+@DoNotImplement
+@CordaSerializable
+public final class net.corda.core.transactions.LedgerTransaction extends net.corda.core.transactions.FullTransaction
+  public <init>(java.util.List<? extends net.corda.core.contracts.StateAndRef<? extends net.corda.core.contracts.ContractState>>, java.util.List<? extends net.corda.core.contracts.TransactionState<? extends net.corda.core.contracts.ContractState>>, java.util.List<? extends net.corda.core.contracts.CommandWithParties<? extends net.corda.core.contracts.CommandData>>, java.util.List<? extends net.corda.core.contracts.Attachment>, net.corda.core.crypto.SecureHash, net.corda.core.identity.Party, net.corda.core.contracts.TimeWindow, net.corda.core.contracts.PrivacySalt)
+  public <init>(java.util.List<? extends net.corda.core.contracts.StateAndRef<? extends net.corda.core.contracts.ContractState>>, java.util.List<? extends net.corda.core.contracts.TransactionState<? extends net.corda.core.contracts.ContractState>>, java.util.List<? extends net.corda.core.contracts.CommandWithParties<? extends net.corda.core.contracts.CommandData>>, java.util.List<? extends net.corda.core.contracts.Attachment>, net.corda.core.crypto.SecureHash, net.corda.core.identity.Party, net.corda.core.contracts.TimeWindow, net.corda.core.contracts.PrivacySalt, net.corda.core.node.NetworkParameters)
+  @NotNull
+  public final java.util.List<net.corda.core.contracts.Command<T>> commandsOfType(Class<T>)
+  @NotNull
+  public final java.util.List<net.corda.core.contracts.StateAndRef<net.corda.core.contracts.ContractState>> component1()
+  @NotNull
+  public final java.util.List<net.corda.core.contracts.TransactionState<net.corda.core.contracts.ContractState>> component2()
+  @NotNull
+  public final java.util.List<net.corda.core.contracts.CommandWithParties<net.corda.core.contracts.CommandData>> component3()
+  @NotNull
+  public final java.util.List<net.corda.core.contracts.Attachment> component4()
+  @NotNull
+  public final net.corda.core.crypto.SecureHash component5()
+  @Nullable
+  public final net.corda.core.identity.Party component6()
+  @Nullable
+  public final net.corda.core.contracts.TimeWindow component7()
+  @NotNull
+  public final net.corda.core.contracts.PrivacySalt component8()
+  @NotNull
+  public final net.corda.core.transactions.LedgerTransaction copy(java.util.List<? extends net.corda.core.contracts.StateAndRef<? extends net.corda.core.contracts.ContractState>>, java.util.List<? extends net.corda.core.contracts.TransactionState<? extends net.corda.core.contracts.ContractState>>, java.util.List<? extends net.corda.core.contracts.CommandWithParties<? extends net.corda.core.contracts.CommandData>>, java.util.List<? extends net.corda.core.contracts.Attachment>, net.corda.core.crypto.SecureHash, net.corda.core.identity.Party, net.corda.core.contracts.TimeWindow, net.corda.core.contracts.PrivacySalt)
+  @NotNull
+  public final net.corda.core.transactions.LedgerTransaction copy(java.util.List<? extends net.corda.core.contracts.StateAndRef<? extends net.corda.core.contracts.ContractState>>, java.util.List<? extends net.corda.core.contracts.TransactionState<? extends net.corda.core.contracts.ContractState>>, java.util.List<? extends net.corda.core.contracts.CommandWithParties<? extends net.corda.core.contracts.CommandData>>, java.util.List<? extends net.corda.core.contracts.Attachment>, net.corda.core.crypto.SecureHash, net.corda.core.identity.Party, net.corda.core.contracts.TimeWindow, net.corda.core.contracts.PrivacySalt, net.corda.core.node.NetworkParameters)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final List filterCommands(Class, function.Predicate)
-  @org.jetbrains.annotations.NotNull public final List filterInRefs(Class, function.Predicate)
-  @org.jetbrains.annotations.NotNull public final List filterInputs(Class, function.Predicate)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.Command findCommand(Class, function.Predicate)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.StateAndRef findInRef(Class, function.Predicate)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.ContractState findInput(Class, function.Predicate)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.Attachment getAttachment(int)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.Attachment getAttachment(net.corda.core.crypto.SecureHash)
-  @org.jetbrains.annotations.NotNull public final List getAttachments()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.Command getCommand(int)
-  @org.jetbrains.annotations.NotNull public final List getCommands()
-  @org.jetbrains.annotations.NotNull public net.corda.core.crypto.SecureHash getId()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.ContractState getInput(int)
-  @org.jetbrains.annotations.NotNull public final List getInputStates()
-  @org.jetbrains.annotations.NotNull public List getInputs()
-  @org.jetbrains.annotations.Nullable public net.corda.core.identity.Party getNotary()
-  @org.jetbrains.annotations.NotNull public List getOutputs()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.PrivacySalt getPrivacySalt()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.contracts.TimeWindow getTimeWindow()
-  @org.jetbrains.annotations.NotNull public final List groupStates(Class, kotlin.jvm.functions.Function1)
+  @NotNull
+  public final java.util.List<net.corda.core.contracts.Command<T>> filterCommands(Class<T>, java.util.function.Predicate<T>)
+  @NotNull
+  public final java.util.List<net.corda.core.contracts.StateAndRef<T>> filterInRefs(Class<T>, java.util.function.Predicate<T>)
+  @NotNull
+  public final java.util.List<T> filterInputs(Class<T>, java.util.function.Predicate<T>)
+  @NotNull
+  public final net.corda.core.contracts.Command<T> findCommand(Class<T>, java.util.function.Predicate<T>)
+  @NotNull
+  public final net.corda.core.contracts.StateAndRef<T> findInRef(Class<T>, java.util.function.Predicate<T>)
+  @NotNull
+  public final T findInput(Class<T>, java.util.function.Predicate<T>)
+  @NotNull
+  public final net.corda.core.contracts.Attachment getAttachment(int)
+  @NotNull
+  public final net.corda.core.contracts.Attachment getAttachment(net.corda.core.crypto.SecureHash)
+  @NotNull
+  public final java.util.List<net.corda.core.contracts.Attachment> getAttachments()
+  @NotNull
+  public final net.corda.core.contracts.Command<T> getCommand(int)
+  @NotNull
+  public final java.util.List<net.corda.core.contracts.CommandWithParties<net.corda.core.contracts.CommandData>> getCommands()
+  @NotNull
+  public net.corda.core.crypto.SecureHash getId()
+  @NotNull
+  public final net.corda.core.contracts.ContractState getInput(int)
+  @NotNull
+  public final java.util.List<net.corda.core.contracts.ContractState> getInputStates()
+  @NotNull
+  public java.util.List<net.corda.core.contracts.StateAndRef<net.corda.core.contracts.ContractState>> getInputs()
+  @Nullable
+  public net.corda.core.identity.Party getNotary()
+  @NotNull
+  public java.util.List<net.corda.core.contracts.TransactionState<net.corda.core.contracts.ContractState>> getOutputs()
+  @NotNull
+  public final net.corda.core.contracts.PrivacySalt getPrivacySalt()
+  @Nullable
+  public final net.corda.core.contracts.TimeWindow getTimeWindow()
+  @NotNull
+  public final java.util.List<net.corda.core.transactions.LedgerTransaction$InOutGroup<T, K>> groupStates(Class<T>, kotlin.jvm.functions.Function1<? super T, ? extends K>)
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.StateAndRef inRef(int)
-  @org.jetbrains.annotations.NotNull public final List inRefsOfType(Class)
-  @org.jetbrains.annotations.NotNull public final List inputsOfType(Class)
+  @NotNull
+  public final net.corda.core.contracts.StateAndRef<T> inRef(int)
+  @NotNull
+  public final java.util.List<net.corda.core.contracts.StateAndRef<T>> inRefsOfType(Class<T>)
+  @NotNull
+  public final java.util.List<T> inputsOfType(Class<T>)
   public String toString()
   public final void verify()
-  @java.lang.Deprecated public static final net.corda.core.transactions.LedgerTransaction$Companion Companion
+  public static final net.corda.core.transactions.LedgerTransaction$Companion Companion
 ##
 public static final class net.corda.core.transactions.LedgerTransaction$InOutGroup extends java.lang.Object
-  public <init>(List, List, Object)
-  @org.jetbrains.annotations.NotNull public final List component1()
-  @org.jetbrains.annotations.NotNull public final List component2()
-  @org.jetbrains.annotations.NotNull public final Object component3()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.LedgerTransaction$InOutGroup copy(List, List, Object)
+  public <init>(java.util.List<? extends T>, java.util.List<? extends T>, K)
+  @NotNull
+  public final java.util.List<T> component1()
+  @NotNull
+  public final java.util.List<T> component2()
+  @NotNull
+  public final K component3()
+  @NotNull
+  public final net.corda.core.transactions.LedgerTransaction$InOutGroup<T, K> copy(java.util.List<? extends T>, java.util.List<? extends T>, K)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final Object getGroupingKey()
-  @org.jetbrains.annotations.NotNull public final List getInputs()
-  @org.jetbrains.annotations.NotNull public final List getOutputs()
+  @NotNull
+  public final K getGroupingKey()
+  @NotNull
+  public final java.util.List<T> getInputs()
+  @NotNull
+  public final java.util.List<T> getOutputs()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.transactions.MissingContractAttachments extends net.corda.core.flows.FlowException
-  public <init>(List)
-  @org.jetbrains.annotations.NotNull public final List getStates()
+@CordaSerializable
+public final class net.corda.core.transactions.MissingContractAttachments extends net.corda.core.flows.FlowException
+  public <init>(java.util.List<? extends net.corda.core.contracts.TransactionState<? extends net.corda.core.contracts.ContractState>>)
+  @NotNull
+  public final java.util.List<net.corda.core.contracts.TransactionState<net.corda.core.contracts.ContractState>> getStates()
 ##
-@net.corda.core.DoNotImplement public final class net.corda.core.transactions.NotaryChangeLedgerTransaction extends net.corda.core.transactions.FullTransaction implements net.corda.core.transactions.TransactionWithSignatures
-  public <init>(List, net.corda.core.identity.Party, net.corda.core.identity.Party, net.corda.core.crypto.SecureHash, List)
+@DoNotImplement
+public final class net.corda.core.transactions.NotaryChangeLedgerTransaction extends net.corda.core.transactions.FullTransaction implements net.corda.core.transactions.TransactionWithSignatures
+  public <init>(java.util.List<? extends net.corda.core.contracts.StateAndRef<? extends net.corda.core.contracts.ContractState>>, net.corda.core.identity.Party, net.corda.core.identity.Party, net.corda.core.crypto.SecureHash, java.util.List<net.corda.core.crypto.TransactionSignature>)
   public void checkSignaturesAreValid()
-  @org.jetbrains.annotations.NotNull public final List component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.Party component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.Party component3()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash component4()
-  @org.jetbrains.annotations.NotNull public final List component5()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.NotaryChangeLedgerTransaction copy(List, net.corda.core.identity.Party, net.corda.core.identity.Party, net.corda.core.crypto.SecureHash, List)
+  @NotNull
+  public final java.util.List<net.corda.core.contracts.StateAndRef<net.corda.core.contracts.ContractState>> component1()
+  @NotNull
+  public final net.corda.core.identity.Party component2()
+  @NotNull
+  public final net.corda.core.identity.Party component3()
+  @NotNull
+  public final net.corda.core.crypto.SecureHash component4()
+  @NotNull
+  public final java.util.List<net.corda.core.crypto.TransactionSignature> component5()
+  @NotNull
+  public final net.corda.core.transactions.NotaryChangeLedgerTransaction copy(java.util.List<? extends net.corda.core.contracts.StateAndRef<? extends net.corda.core.contracts.ContractState>>, net.corda.core.identity.Party, net.corda.core.identity.Party, net.corda.core.crypto.SecureHash, java.util.List<net.corda.core.crypto.TransactionSignature>)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public net.corda.core.crypto.SecureHash getId()
-  @org.jetbrains.annotations.NotNull public List getInputs()
-  @org.jetbrains.annotations.NotNull public List getKeyDescriptions(Set)
-  @org.jetbrains.annotations.NotNull public Set getMissingSigners()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.Party getNewNotary()
-  @org.jetbrains.annotations.NotNull public net.corda.core.identity.Party getNotary()
-  @org.jetbrains.annotations.NotNull public List getOutputs()
-  @org.jetbrains.annotations.NotNull public Set getRequiredSigningKeys()
-  @org.jetbrains.annotations.NotNull public List getSigs()
+  @NotNull
+  public net.corda.core.crypto.SecureHash getId()
+  @NotNull
+  public java.util.List<net.corda.core.contracts.StateAndRef<net.corda.core.contracts.ContractState>> getInputs()
+  @NotNull
+  public java.util.List<String> getKeyDescriptions(java.util.Set<? extends java.security.PublicKey>)
+  @NotNull
+  public java.util.Set<java.security.PublicKey> getMissingSigners()
+  @NotNull
+  public final net.corda.core.identity.Party getNewNotary()
+  @NotNull
+  public net.corda.core.identity.Party getNotary()
+  @NotNull
+  public java.util.List<net.corda.core.contracts.TransactionState<net.corda.core.contracts.ContractState>> getOutputs()
+  @NotNull
+  public java.util.Set<java.security.PublicKey> getRequiredSigningKeys()
+  @NotNull
+  public java.util.List<net.corda.core.crypto.TransactionSignature> getSigs()
   public int hashCode()
   public String toString()
   public void verifyRequiredSignatures()
-  public void verifySignaturesExcept(Collection)
+  public void verifySignaturesExcept(java.util.Collection<? extends java.security.PublicKey>)
   public void verifySignaturesExcept(java.security.PublicKey...)
 ##
-@net.corda.core.DoNotImplement @net.corda.core.serialization.CordaSerializable public final class net.corda.core.transactions.NotaryChangeWireTransaction extends net.corda.core.transactions.CoreTransaction
-  public <init>(List)
-  @kotlin.Deprecated public <init>(List, net.corda.core.identity.Party, net.corda.core.identity.Party)
-  @org.jetbrains.annotations.NotNull public final List component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.NotaryChangeWireTransaction copy(List)
+@DoNotImplement
+@CordaSerializable
+public final class net.corda.core.transactions.NotaryChangeWireTransaction extends net.corda.core.transactions.CoreTransaction
+  public <init>(java.util.List<? extends net.corda.core.utilities.OpaqueBytes>)
+  public <init>(java.util.List<net.corda.core.contracts.StateRef>, net.corda.core.identity.Party, net.corda.core.identity.Party)
+  @NotNull
+  public final java.util.List<net.corda.core.utilities.OpaqueBytes> component1()
+  @NotNull
+  public final net.corda.core.transactions.NotaryChangeWireTransaction copy(java.util.List<? extends net.corda.core.utilities.OpaqueBytes>)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public net.corda.core.crypto.SecureHash getId()
-  @org.jetbrains.annotations.NotNull public List getInputs()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.Party getNewNotary()
-  @org.jetbrains.annotations.NotNull public net.corda.core.identity.Party getNotary()
-  @org.jetbrains.annotations.NotNull public List getOutputs()
-  @org.jetbrains.annotations.NotNull public final List getSerializedComponents()
+  @NotNull
+  public net.corda.core.crypto.SecureHash getId()
+  @NotNull
+  public java.util.List<net.corda.core.contracts.StateRef> getInputs()
+  @NotNull
+  public final net.corda.core.identity.Party getNewNotary()
+  @NotNull
+  public net.corda.core.identity.Party getNotary()
+  @NotNull
+  public java.util.List<net.corda.core.contracts.TransactionState<net.corda.core.contracts.ContractState>> getOutputs()
+  @NotNull
+  public final java.util.List<net.corda.core.utilities.OpaqueBytes> getSerializedComponents()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.NotaryChangeLedgerTransaction resolve(net.corda.core.node.ServiceHub, List)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.NotaryChangeLedgerTransaction resolve(net.corda.core.node.ServicesForResolution, List)
+  @NotNull
+  public final net.corda.core.transactions.NotaryChangeLedgerTransaction resolve(net.corda.core.node.ServiceHub, java.util.List<net.corda.core.crypto.TransactionSignature>)
+  @NotNull
+  public final net.corda.core.transactions.NotaryChangeLedgerTransaction resolve(net.corda.core.node.ServicesForResolution, java.util.List<net.corda.core.crypto.TransactionSignature>)
   public String toString()
 ##
 public static final class net.corda.core.transactions.NotaryChangeWireTransaction$Component extends java.lang.Enum
-  protected <init>(String, int)
+  protected <init>()
   public static net.corda.core.transactions.NotaryChangeWireTransaction$Component valueOf(String)
   public static net.corda.core.transactions.NotaryChangeWireTransaction$Component[] values()
 ##
-@net.corda.core.DoNotImplement @net.corda.core.serialization.CordaSerializable public final class net.corda.core.transactions.SignedTransaction extends java.lang.Object implements net.corda.core.transactions.TransactionWithSignatures
-  public <init>(net.corda.core.serialization.SerializedBytes, List)
-  public <init>(net.corda.core.transactions.CoreTransaction, List)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.FilteredTransaction buildFilteredTransaction(function.Predicate)
+@DoNotImplement
+@CordaSerializable
+public final class net.corda.core.transactions.SignedTransaction extends java.lang.Object implements net.corda.core.transactions.TransactionWithSignatures
+  public <init>(net.corda.core.serialization.SerializedBytes<net.corda.core.transactions.CoreTransaction>, java.util.List<net.corda.core.crypto.TransactionSignature>)
+  public <init>(net.corda.core.transactions.CoreTransaction, java.util.List<net.corda.core.crypto.TransactionSignature>)
+  @NotNull
+  public final net.corda.core.transactions.FilteredTransaction buildFilteredTransaction(java.util.function.Predicate<Object>)
   public void checkSignaturesAreValid()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.serialization.SerializedBytes component1()
-  @org.jetbrains.annotations.NotNull public final List component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.SignedTransaction copy(net.corda.core.serialization.SerializedBytes, List)
+  @NotNull
+  public final net.corda.core.serialization.SerializedBytes<net.corda.core.transactions.CoreTransaction> component1()
+  @NotNull
+  public final java.util.List<net.corda.core.crypto.TransactionSignature> component2()
+  @NotNull
+  public final net.corda.core.transactions.SignedTransaction copy(net.corda.core.serialization.SerializedBytes<net.corda.core.transactions.CoreTransaction>, java.util.List<net.corda.core.crypto.TransactionSignature>)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.CoreTransaction getCoreTransaction()
-  @org.jetbrains.annotations.NotNull public net.corda.core.crypto.SecureHash getId()
-  @org.jetbrains.annotations.NotNull public final List getInputs()
-  @org.jetbrains.annotations.NotNull public ArrayList getKeyDescriptions(Set)
-  @org.jetbrains.annotations.NotNull public Set getMissingSigners()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.identity.Party getNotary()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.NotaryChangeWireTransaction getNotaryChangeTx()
-  @org.jetbrains.annotations.NotNull public Set getRequiredSigningKeys()
-  @org.jetbrains.annotations.NotNull public List getSigs()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.WireTransaction getTx()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.serialization.SerializedBytes getTxBits()
+  @NotNull
+  public final net.corda.core.transactions.CoreTransaction getCoreTransaction()
+  @NotNull
+  public net.corda.core.crypto.SecureHash getId()
+  @NotNull
+  public final java.util.List<net.corda.core.contracts.StateRef> getInputs()
+  @NotNull
+  public java.util.ArrayList<String> getKeyDescriptions(java.util.Set<? extends java.security.PublicKey>)
+  @NotNull
+  public java.util.Set<java.security.PublicKey> getMissingSigners()
+  @Nullable
+  public final net.corda.core.identity.Party getNotary()
+  @NotNull
+  public final net.corda.core.transactions.NotaryChangeWireTransaction getNotaryChangeTx()
+  @NotNull
+  public java.util.Set<java.security.PublicKey> getRequiredSigningKeys()
+  @NotNull
+  public java.util.List<net.corda.core.crypto.TransactionSignature> getSigs()
+  @NotNull
+  public final net.corda.core.transactions.WireTransaction getTx()
+  @NotNull
+  public final net.corda.core.serialization.SerializedBytes<net.corda.core.transactions.CoreTransaction> getTxBits()
   public int hashCode()
-  @kotlin.Deprecated public final boolean isNotaryChangeTransaction()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.SignedTransaction plus(Collection)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.SignedTransaction plus(net.corda.core.crypto.TransactionSignature)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.BaseTransaction resolveBaseTransaction(net.corda.core.node.ServicesForResolution)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.ContractUpgradeLedgerTransaction resolveContractUpgradeTransaction(net.corda.core.node.ServicesForResolution)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.NotaryChangeLedgerTransaction resolveNotaryChangeTransaction(net.corda.core.node.ServiceHub)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.NotaryChangeLedgerTransaction resolveNotaryChangeTransaction(net.corda.core.node.ServicesForResolution)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.TransactionWithSignatures resolveTransactionWithSignatures(net.corda.core.node.ServicesForResolution)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.LedgerTransaction toLedgerTransaction(net.corda.core.node.ServiceHub)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.LedgerTransaction toLedgerTransaction(net.corda.core.node.ServiceHub, boolean)
-  @org.jetbrains.annotations.NotNull public String toString()
+  public final boolean isNotaryChangeTransaction()
+  @NotNull
+  public final net.corda.core.transactions.SignedTransaction plus(java.util.Collection<net.corda.core.crypto.TransactionSignature>)
+  @NotNull
+  public final net.corda.core.transactions.SignedTransaction plus(net.corda.core.crypto.TransactionSignature)
+  @NotNull
+  public final net.corda.core.transactions.BaseTransaction resolveBaseTransaction(net.corda.core.node.ServicesForResolution)
+  @NotNull
+  public final net.corda.core.transactions.ContractUpgradeLedgerTransaction resolveContractUpgradeTransaction(net.corda.core.node.ServicesForResolution)
+  @NotNull
+  public final net.corda.core.transactions.NotaryChangeLedgerTransaction resolveNotaryChangeTransaction(net.corda.core.node.ServiceHub)
+  @NotNull
+  public final net.corda.core.transactions.NotaryChangeLedgerTransaction resolveNotaryChangeTransaction(net.corda.core.node.ServicesForResolution)
+  @NotNull
+  public final net.corda.core.transactions.TransactionWithSignatures resolveTransactionWithSignatures(net.corda.core.node.ServicesForResolution)
+  @NotNull
+  public final net.corda.core.transactions.LedgerTransaction toLedgerTransaction(net.corda.core.node.ServiceHub)
+  @NotNull
+  public final net.corda.core.transactions.LedgerTransaction toLedgerTransaction(net.corda.core.node.ServiceHub, boolean)
+  @NotNull
+  public String toString()
   public final void verify(net.corda.core.node.ServiceHub)
   public final void verify(net.corda.core.node.ServiceHub, boolean)
   public void verifyRequiredSignatures()
-  public void verifySignaturesExcept(Collection)
+  public void verifySignaturesExcept(java.util.Collection<? extends java.security.PublicKey>)
   public void verifySignaturesExcept(java.security.PublicKey...)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.SignedTransaction withAdditionalSignature(java.security.KeyPair, net.corda.core.crypto.SignatureMetadata)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.SignedTransaction withAdditionalSignature(net.corda.core.crypto.TransactionSignature)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.SignedTransaction withAdditionalSignatures(Iterable)
-  @java.lang.Deprecated public static final net.corda.core.transactions.SignedTransaction$Companion Companion
+  @NotNull
+  public final net.corda.core.transactions.SignedTransaction withAdditionalSignature(java.security.KeyPair, net.corda.core.crypto.SignatureMetadata)
+  @NotNull
+  public final net.corda.core.transactions.SignedTransaction withAdditionalSignature(net.corda.core.crypto.TransactionSignature)
+  @NotNull
+  public final net.corda.core.transactions.SignedTransaction withAdditionalSignatures(Iterable<net.corda.core.crypto.TransactionSignature>)
+  public static final net.corda.core.transactions.SignedTransaction$Companion Companion
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.transactions.SignedTransaction$SignaturesMissingException extends java.security.SignatureException implements net.corda.core.CordaThrowable, net.corda.core.contracts.NamedByHash
-  public <init>(Set, List, net.corda.core.crypto.SecureHash)
+@CordaSerializable
+public static final class net.corda.core.transactions.SignedTransaction$SignaturesMissingException extends java.security.SignatureException implements net.corda.core.CordaThrowable, net.corda.core.contracts.NamedByHash
+  public <init>(java.util.Set<? extends java.security.PublicKey>, java.util.List<String>, net.corda.core.crypto.SecureHash)
   public void addSuppressed(Throwable[])
-  @org.jetbrains.annotations.NotNull public final List getDescriptions()
-  @org.jetbrains.annotations.NotNull public net.corda.core.crypto.SecureHash getId()
-  @org.jetbrains.annotations.NotNull public final Set getMissing()
-  @org.jetbrains.annotations.Nullable public String getOriginalExceptionClassName()
-  @org.jetbrains.annotations.Nullable public String getOriginalMessage()
+  @NotNull
+  public final java.util.List<String> getDescriptions()
+  @NotNull
+  public net.corda.core.crypto.SecureHash getId()
+  @NotNull
+  public final java.util.Set<java.security.PublicKey> getMissing()
+  @Nullable
+  public String getOriginalExceptionClassName()
+  @Nullable
+  public String getOriginalMessage()
   public void setCause(Throwable)
   public void setMessage(String)
   public void setOriginalExceptionClassName(String)
@@ -3258,307 +5032,474 @@ public static final class net.corda.core.transactions.NotaryChangeWireTransactio
 public class net.corda.core.transactions.TransactionBuilder extends java.lang.Object
   public <init>()
   public <init>(net.corda.core.identity.Party)
-  public <init>(net.corda.core.identity.Party, UUID, List, List, List, List, net.corda.core.contracts.TimeWindow, net.corda.core.contracts.PrivacySalt)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.TransactionBuilder addAttachment(net.corda.core.crypto.SecureHash)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.TransactionBuilder addCommand(net.corda.core.contracts.Command)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.TransactionBuilder addCommand(net.corda.core.contracts.CommandData, List)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.TransactionBuilder addCommand(net.corda.core.contracts.CommandData, java.security.PublicKey...)
-  @org.jetbrains.annotations.NotNull public net.corda.core.transactions.TransactionBuilder addInputState(net.corda.core.contracts.StateAndRef)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.TransactionBuilder addOutputState(net.corda.core.contracts.ContractState, String)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.TransactionBuilder addOutputState(net.corda.core.contracts.ContractState, String, net.corda.core.contracts.AttachmentConstraint)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.TransactionBuilder addOutputState(net.corda.core.contracts.ContractState, String, net.corda.core.identity.Party)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.TransactionBuilder addOutputState(net.corda.core.contracts.ContractState, String, net.corda.core.identity.Party, Integer)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.TransactionBuilder addOutputState(net.corda.core.contracts.ContractState, String, net.corda.core.identity.Party, Integer, net.corda.core.contracts.AttachmentConstraint)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.TransactionBuilder addOutputState(net.corda.core.contracts.TransactionState)
-  @org.jetbrains.annotations.NotNull public final List attachments()
-  @org.jetbrains.annotations.NotNull public final List commands()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.TransactionBuilder copy()
-  @org.jetbrains.annotations.NotNull protected final List getAttachments()
-  @org.jetbrains.annotations.NotNull protected final List getCommands()
-  @org.jetbrains.annotations.NotNull protected final List getInputs()
-  @org.jetbrains.annotations.NotNull public final UUID getLockId()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.identity.Party getNotary()
-  @org.jetbrains.annotations.NotNull protected final List getOutputs()
-  @org.jetbrains.annotations.NotNull protected final net.corda.core.contracts.PrivacySalt getPrivacySalt()
-  @org.jetbrains.annotations.Nullable protected final net.corda.core.contracts.TimeWindow getWindow()
-  @org.jetbrains.annotations.NotNull public final List inputStates()
-  @org.jetbrains.annotations.NotNull public final List outputStates()
-  public final void setLockId(UUID)
+  public <init>(net.corda.core.identity.Party, java.util.UUID, java.util.List<net.corda.core.contracts.StateRef>, java.util.List<net.corda.core.crypto.SecureHash>, java.util.List<net.corda.core.contracts.TransactionState<net.corda.core.contracts.ContractState>>, java.util.List<net.corda.core.contracts.Command<?>>, net.corda.core.contracts.TimeWindow, net.corda.core.contracts.PrivacySalt)
+  @NotNull
+  public final net.corda.core.transactions.TransactionBuilder addAttachment(net.corda.core.crypto.SecureHash)
+  @NotNull
+  public final net.corda.core.transactions.TransactionBuilder addCommand(net.corda.core.contracts.Command<?>)
+  @NotNull
+  public final net.corda.core.transactions.TransactionBuilder addCommand(net.corda.core.contracts.CommandData, java.util.List<? extends java.security.PublicKey>)
+  @NotNull
+  public final net.corda.core.transactions.TransactionBuilder addCommand(net.corda.core.contracts.CommandData, java.security.PublicKey...)
+  @NotNull
+  public net.corda.core.transactions.TransactionBuilder addInputState(net.corda.core.contracts.StateAndRef<?>)
+  @NotNull
+  public final net.corda.core.transactions.TransactionBuilder addOutputState(net.corda.core.contracts.ContractState, String)
+  @NotNull
+  public final net.corda.core.transactions.TransactionBuilder addOutputState(net.corda.core.contracts.ContractState, String, net.corda.core.contracts.AttachmentConstraint)
+  @NotNull
+  public final net.corda.core.transactions.TransactionBuilder addOutputState(net.corda.core.contracts.ContractState, String, net.corda.core.identity.Party)
+  @NotNull
+  public final net.corda.core.transactions.TransactionBuilder addOutputState(net.corda.core.contracts.ContractState, String, net.corda.core.identity.Party, Integer)
+  @NotNull
+  public final net.corda.core.transactions.TransactionBuilder addOutputState(net.corda.core.contracts.ContractState, String, net.corda.core.identity.Party, Integer, net.corda.core.contracts.AttachmentConstraint)
+  @NotNull
+  public final net.corda.core.transactions.TransactionBuilder addOutputState(net.corda.core.contracts.TransactionState<?>)
+  @NotNull
+  public final java.util.List<net.corda.core.crypto.SecureHash> attachments()
+  @NotNull
+  public final java.util.List<net.corda.core.contracts.Command<?>> commands()
+  @NotNull
+  public final net.corda.core.transactions.TransactionBuilder copy()
+  @NotNull
+  protected final java.util.List<net.corda.core.crypto.SecureHash> getAttachments()
+  @NotNull
+  protected final java.util.List<net.corda.core.contracts.Command<?>> getCommands()
+  @NotNull
+  protected final java.util.List<net.corda.core.contracts.StateRef> getInputs()
+  @NotNull
+  public final java.util.UUID getLockId()
+  @Nullable
+  public final net.corda.core.identity.Party getNotary()
+  @NotNull
+  protected final java.util.List<net.corda.core.contracts.TransactionState<net.corda.core.contracts.ContractState>> getOutputs()
+  @NotNull
+  protected final net.corda.core.contracts.PrivacySalt getPrivacySalt()
+  @Nullable
+  protected final net.corda.core.contracts.TimeWindow getWindow()
+  @NotNull
+  public final java.util.List<net.corda.core.contracts.StateRef> inputStates()
+  @NotNull
+  public final java.util.List<net.corda.core.contracts.TransactionState<?>> outputStates()
+  public final void setLockId(java.util.UUID)
   public final void setNotary(net.corda.core.identity.Party)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.TransactionBuilder setPrivacySalt(net.corda.core.contracts.PrivacySalt)
+  @NotNull
+  public final net.corda.core.transactions.TransactionBuilder setPrivacySalt(net.corda.core.contracts.PrivacySalt)
   protected final void setPrivacySalt(net.corda.core.contracts.PrivacySalt)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.TransactionBuilder setTimeWindow(java.time.Instant, java.time.Duration)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.TransactionBuilder setTimeWindow(net.corda.core.contracts.TimeWindow)
+  @NotNull
+  public final net.corda.core.transactions.TransactionBuilder setTimeWindow(java.time.Instant, java.time.Duration)
+  @NotNull
+  public final net.corda.core.transactions.TransactionBuilder setTimeWindow(net.corda.core.contracts.TimeWindow)
   protected final void setWindow(net.corda.core.contracts.TimeWindow)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.LedgerTransaction toLedgerTransaction(net.corda.core.node.ServiceHub)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.SignedTransaction toSignedTransaction(net.corda.core.node.services.KeyManagementService, java.security.PublicKey, net.corda.core.crypto.SignatureMetadata, net.corda.core.node.ServicesForResolution)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.WireTransaction toWireTransaction(net.corda.core.node.ServicesForResolution)
+  @NotNull
+  public final net.corda.core.transactions.LedgerTransaction toLedgerTransaction(net.corda.core.node.ServiceHub)
+  @NotNull
+  public final net.corda.core.transactions.SignedTransaction toSignedTransaction(net.corda.core.node.services.KeyManagementService, java.security.PublicKey, net.corda.core.crypto.SignatureMetadata, net.corda.core.node.ServicesForResolution)
+  @NotNull
+  public final net.corda.core.transactions.WireTransaction toWireTransaction(net.corda.core.node.ServicesForResolution)
   public final void verify(net.corda.core.node.ServiceHub)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.TransactionBuilder withItems(Object...)
+  @NotNull
+  public final net.corda.core.transactions.TransactionBuilder withItems(Object...)
 ##
-@net.corda.core.DoNotImplement public interface net.corda.core.transactions.TransactionWithSignatures extends net.corda.core.contracts.NamedByHash
+@DoNotImplement
+public interface net.corda.core.transactions.TransactionWithSignatures extends net.corda.core.contracts.NamedByHash
   public abstract void checkSignaturesAreValid()
-  @org.jetbrains.annotations.NotNull public abstract List getKeyDescriptions(Set)
-  @org.jetbrains.annotations.NotNull public abstract Set getMissingSigners()
-  @org.jetbrains.annotations.NotNull public abstract Set getRequiredSigningKeys()
-  @org.jetbrains.annotations.NotNull public abstract List getSigs()
+  @NotNull
+  public abstract java.util.List<String> getKeyDescriptions(java.util.Set<? extends java.security.PublicKey>)
+  @NotNull
+  public abstract java.util.Set<java.security.PublicKey> getMissingSigners()
+  @NotNull
+  public abstract java.util.Set<java.security.PublicKey> getRequiredSigningKeys()
+  @NotNull
+  public abstract java.util.List<net.corda.core.crypto.TransactionSignature> getSigs()
   public abstract void verifyRequiredSignatures()
-  public abstract void verifySignaturesExcept(Collection)
+  public abstract void verifySignaturesExcept(java.util.Collection<? extends java.security.PublicKey>)
   public abstract void verifySignaturesExcept(java.security.PublicKey...)
 ##
-@net.corda.core.DoNotImplement @net.corda.core.serialization.CordaSerializable public abstract class net.corda.core.transactions.TraversableTransaction extends net.corda.core.transactions.CoreTransaction
-  public <init>(List)
-  @org.jetbrains.annotations.NotNull public final List getAttachments()
-  @org.jetbrains.annotations.NotNull public final List getAvailableComponentGroups()
-  @org.jetbrains.annotations.NotNull public final List getCommands()
-  @org.jetbrains.annotations.NotNull public List getComponentGroups()
-  @org.jetbrains.annotations.NotNull public List getInputs()
-  @org.jetbrains.annotations.Nullable public net.corda.core.identity.Party getNotary()
-  @org.jetbrains.annotations.NotNull public List getOutputs()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.contracts.TimeWindow getTimeWindow()
+@DoNotImplement
+@CordaSerializable
+public abstract class net.corda.core.transactions.TraversableTransaction extends net.corda.core.transactions.CoreTransaction
+  public <init>(java.util.List<? extends net.corda.core.transactions.ComponentGroup>)
+  @NotNull
+  public final java.util.List<net.corda.core.crypto.SecureHash> getAttachments()
+  @NotNull
+  public final java.util.List<java.util.List<Object>> getAvailableComponentGroups()
+  @NotNull
+  public final java.util.List<net.corda.core.contracts.Command<?>> getCommands()
+  @NotNull
+  public java.util.List<net.corda.core.transactions.ComponentGroup> getComponentGroups()
+  @NotNull
+  public java.util.List<net.corda.core.contracts.StateRef> getInputs()
+  @Nullable
+  public net.corda.core.identity.Party getNotary()
+  @NotNull
+  public java.util.List<net.corda.core.contracts.TransactionState<net.corda.core.contracts.ContractState>> getOutputs()
+  @Nullable
+  public final net.corda.core.contracts.TimeWindow getTimeWindow()
 ##
-@net.corda.core.DoNotImplement @net.corda.core.serialization.CordaSerializable public final class net.corda.core.transactions.WireTransaction extends net.corda.core.transactions.TraversableTransaction
-  @kotlin.Deprecated public <init>(List, List, List, List, net.corda.core.identity.Party, net.corda.core.contracts.TimeWindow, net.corda.core.contracts.PrivacySalt)
-  public <init>(List, net.corda.core.contracts.PrivacySalt)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.FilteredTransaction buildFilteredTransaction(function.Predicate)
+@DoNotImplement
+@CordaSerializable
+public final class net.corda.core.transactions.WireTransaction extends net.corda.core.transactions.TraversableTransaction
+  public <init>(java.util.List<net.corda.core.contracts.StateRef>, java.util.List<? extends net.corda.core.crypto.SecureHash>, java.util.List<? extends net.corda.core.contracts.TransactionState<? extends net.corda.core.contracts.ContractState>>, java.util.List<? extends net.corda.core.contracts.Command<?>>, net.corda.core.identity.Party, net.corda.core.contracts.TimeWindow, net.corda.core.contracts.PrivacySalt)
+  public <init>(java.util.List<? extends net.corda.core.transactions.ComponentGroup>, net.corda.core.contracts.PrivacySalt)
+  @NotNull
+  public final net.corda.core.transactions.FilteredTransaction buildFilteredTransaction(java.util.function.Predicate<Object>)
   public final void checkSignature(net.corda.core.crypto.TransactionSignature)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public net.corda.core.crypto.SecureHash getId()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.MerkleTree getMerkleTree()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.PrivacySalt getPrivacySalt()
-  @org.jetbrains.annotations.NotNull public final Set getRequiredSigningKeys()
+  @NotNull
+  public net.corda.core.crypto.SecureHash getId()
+  @NotNull
+  public final net.corda.core.crypto.MerkleTree getMerkleTree()
+  @NotNull
+  public final net.corda.core.contracts.PrivacySalt getPrivacySalt()
+  @NotNull
+  public final java.util.Set<java.security.PublicKey> getRequiredSigningKeys()
   public int hashCode()
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.LedgerTransaction toLedgerTransaction(kotlin.jvm.functions.Function1, kotlin.jvm.functions.Function1, kotlin.jvm.functions.Function1, kotlin.jvm.functions.Function1)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.LedgerTransaction toLedgerTransaction(net.corda.core.node.ServicesForResolution)
-  @org.jetbrains.annotations.NotNull public String toString()
+  @NotNull
+  public final net.corda.core.transactions.LedgerTransaction toLedgerTransaction(kotlin.jvm.functions.Function1<? super java.security.PublicKey, net.corda.core.identity.Party>, kotlin.jvm.functions.Function1<? super net.corda.core.crypto.SecureHash, ? extends net.corda.core.contracts.Attachment>, kotlin.jvm.functions.Function1<? super net.corda.core.contracts.StateRef, ? extends net.corda.core.contracts.TransactionState<?>>, kotlin.jvm.functions.Function1<? super net.corda.core.contracts.TransactionState<? extends net.corda.core.contracts.ContractState>, ? extends net.corda.core.crypto.SecureHash>)
+  @NotNull
+  public final net.corda.core.transactions.LedgerTransaction toLedgerTransaction(net.corda.core.node.ServicesForResolution)
+  @NotNull
+  public String toString()
   public static final net.corda.core.transactions.WireTransaction$Companion Companion
 ##
 public static final class net.corda.core.transactions.WireTransaction$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final List createComponentGroups(List, List, List, List, net.corda.core.identity.Party, net.corda.core.contracts.TimeWindow)
+  @NotNull
+  public final java.util.List<net.corda.core.transactions.ComponentGroup> createComponentGroups(java.util.List<net.corda.core.contracts.StateRef>, java.util.List<? extends net.corda.core.contracts.TransactionState<? extends net.corda.core.contracts.ContractState>>, java.util.List<? extends net.corda.core.contracts.Command<?>>, java.util.List<? extends net.corda.core.crypto.SecureHash>, net.corda.core.identity.Party, net.corda.core.contracts.TimeWindow)
 ##
 public final class net.corda.core.utilities.ByteArrays extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public static final byte[] parseAsHex(String)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.utilities.ByteSequence sequence(byte[], int, int)
-  @org.jetbrains.annotations.NotNull public static final String toHexString(byte[])
+  @NotNull
+  public static final byte[] parseAsHex(String)
+  @NotNull
+  public static final net.corda.core.utilities.ByteSequence sequence(byte[], int, int)
+  @NotNull
+  public static final String toHexString(byte[])
 ##
-@net.corda.core.serialization.CordaSerializable public abstract class net.corda.core.utilities.ByteSequence extends java.lang.Object implements java.lang.Comparable
+@CordaSerializable
+public abstract class net.corda.core.utilities.ByteSequence extends java.lang.Object implements java.lang.Comparable
   public int compareTo(net.corda.core.utilities.ByteSequence)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ByteSequence copy()
-  @org.jetbrains.annotations.NotNull public final byte[] copyBytes()
+  @NotNull
+  public final net.corda.core.utilities.ByteSequence copy()
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public abstract byte[] getBytes()
+  @NotNull
+  public abstract byte[] getBytes()
   public final int getOffset()
   public final int getSize()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.utilities.ByteSequence of(byte[])
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.utilities.ByteSequence of(byte[], int)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.utilities.ByteSequence of(byte[], int, int)
-  @org.jetbrains.annotations.NotNull public final java.io.ByteArrayInputStream open()
-  @org.jetbrains.annotations.NotNull public final java.nio.ByteBuffer putTo(java.nio.ByteBuffer)
-  @org.jetbrains.annotations.NotNull public final java.nio.ByteBuffer slice(int, int)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ByteSequence subSequence(int, int)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ByteSequence take(int)
-  @org.jetbrains.annotations.NotNull public String toString()
-  public final void writeTo(java.io.OutputStream)
+  @NotNull
+  public static final net.corda.core.utilities.ByteSequence of(byte[])
+  @NotNull
+  public static final net.corda.core.utilities.ByteSequence of(byte[], int)
+  @NotNull
+  public static final net.corda.core.utilities.ByteSequence of(byte[], int, int)
+  @NotNull
+  public final java.io.ByteArrayInputStream open()
+  @NotNull
+  public final net.corda.core.utilities.ByteSequence subSequence(int, int)
+  @NotNull
+  public final net.corda.core.utilities.ByteSequence take(int)
+  @NotNull
+  public String toString()
   public static final net.corda.core.utilities.ByteSequence$Companion Companion
 ##
 public static final class net.corda.core.utilities.ByteSequence$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ByteSequence of(byte[])
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ByteSequence of(byte[], int)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ByteSequence of(byte[], int, int)
+  @NotNull
+  public final net.corda.core.utilities.ByteSequence of(byte[])
+  @NotNull
+  public final net.corda.core.utilities.ByteSequence of(byte[], int)
+  @NotNull
+  public final net.corda.core.utilities.ByteSequence of(byte[], int, int)
 ##
 public final class net.corda.core.utilities.EncodingUtils extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public static final byte[] base58ToByteArray(String)
-  @org.jetbrains.annotations.NotNull public static final String base58ToRealString(String)
-  @org.jetbrains.annotations.NotNull public static final String base58toBase64(String)
-  @org.jetbrains.annotations.NotNull public static final String base58toHex(String)
-  @org.jetbrains.annotations.NotNull public static final byte[] base64ToByteArray(String)
-  @org.jetbrains.annotations.NotNull public static final String base64ToRealString(String)
-  @org.jetbrains.annotations.NotNull public static final String base64toBase58(String)
-  @org.jetbrains.annotations.NotNull public static final String base64toHex(String)
-  @org.jetbrains.annotations.NotNull public static final String hexToBase58(String)
-  @org.jetbrains.annotations.NotNull public static final String hexToBase64(String)
-  @org.jetbrains.annotations.NotNull public static final byte[] hexToByteArray(String)
-  @org.jetbrains.annotations.NotNull public static final String hexToRealString(String)
-  @org.jetbrains.annotations.NotNull public static final java.security.PublicKey parsePublicKeyBase58(String)
-  @org.jetbrains.annotations.NotNull public static final String toBase58(byte[])
-  @org.jetbrains.annotations.NotNull public static final String toBase58String(java.security.PublicKey)
-  @org.jetbrains.annotations.NotNull public static final String toBase64(byte[])
-  @org.jetbrains.annotations.NotNull public static final String toHex(byte[])
-  @org.jetbrains.annotations.NotNull public static final byte[] toSHA256Bytes(java.security.PublicKey)
+  @NotNull
+  public static final byte[] base58ToByteArray(String)
+  @NotNull
+  public static final String base58ToRealString(String)
+  @NotNull
+  public static final String base58toBase64(String)
+  @NotNull
+  public static final String base58toHex(String)
+  @NotNull
+  public static final byte[] base64ToByteArray(String)
+  @NotNull
+  public static final String base64ToRealString(String)
+  @NotNull
+  public static final String base64toBase58(String)
+  @NotNull
+  public static final String base64toHex(String)
+  @NotNull
+  public static final String hexToBase58(String)
+  @NotNull
+  public static final String hexToBase64(String)
+  @NotNull
+  public static final byte[] hexToByteArray(String)
+  @NotNull
+  public static final String hexToRealString(String)
+  @NotNull
+  public static final java.security.PublicKey parsePublicKeyBase58(String)
+  @NotNull
+  public static final String toBase58(byte[])
+  @NotNull
+  public static final String toBase58String(java.security.PublicKey)
+  @NotNull
+  public static final String toBase64(byte[])
+  @NotNull
+  public static final String toHex(byte[])
+  @NotNull
+  public static final byte[] toSHA256Bytes(java.security.PublicKey)
   public static final int MAX_HASH_HEX_SIZE = 130
 ##
 public class net.corda.core.utilities.Id extends java.lang.Object
-  public <init>(Object, String, java.time.Instant)
+  public <init>(VALUE, String, java.time.Instant)
   public final boolean equals(Object)
-  @org.jetbrains.annotations.Nullable public final String getEntityType()
-  @org.jetbrains.annotations.NotNull public final java.time.Instant getTimestamp()
-  @org.jetbrains.annotations.NotNull public final Object getValue()
+  @Nullable
+  public final String getEntityType()
+  @NotNull
+  public final java.time.Instant getTimestamp()
+  @NotNull
+  public final VALUE getValue()
   public final int hashCode()
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.utilities.Id newInstance(Object, String, java.time.Instant)
-  @org.jetbrains.annotations.NotNull public final String toString()
+  @NotNull
+  public static final net.corda.core.utilities.Id<V> newInstance(V, String, java.time.Instant)
+  @NotNull
+  public final String toString()
   public static final net.corda.core.utilities.Id$Companion Companion
 ##
 public static final class net.corda.core.utilities.Id$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.Id newInstance(Object, String, java.time.Instant)
+  @NotNull
+  public final net.corda.core.utilities.Id<V> newInstance(V, String, java.time.Instant)
 ##
 public final class net.corda.core.utilities.KotlinUtilsKt extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public static final org.slf4j.Logger contextLogger(Object)
-  public static final void debug(org.slf4j.Logger, kotlin.jvm.functions.Function0)
+  @NotNull
+  public static final org.slf4j.Logger contextLogger(Object)
+  public static final void debug(org.slf4j.Logger, kotlin.jvm.functions.Function0<String>)
   public static final int exactAdd(int, int)
   public static final long exactAdd(long, long)
-  @org.jetbrains.annotations.NotNull public static final java.time.Duration getDays(int)
-  @org.jetbrains.annotations.NotNull public static final java.time.Duration getHours(int)
-  @org.jetbrains.annotations.NotNull public static final java.time.Duration getMillis(int)
-  @org.jetbrains.annotations.NotNull public static final java.time.Duration getMinutes(int)
-  public static final Object getOrThrow(concurrent.Future, java.time.Duration)
-  @org.jetbrains.annotations.NotNull public static final java.time.Duration getSeconds(int)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.utilities.NonEmptySet toNonEmptySet(Collection)
-  public static final void trace(org.slf4j.Logger, kotlin.jvm.functions.Function0)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.utilities.PropertyDelegate transient(kotlin.jvm.functions.Function0)
+  @NotNull
+  public static final java.time.Duration getDays(int)
+  @NotNull
+  public static final java.time.Duration getHours(int)
+  @NotNull
+  public static final java.time.Duration getMillis(int)
+  @NotNull
+  public static final java.time.Duration getMinutes(int)
+  public static final V getOrThrow(java.util.concurrent.Future<V>, java.time.Duration)
+  @NotNull
+  public static final java.time.Duration getSeconds(int)
+  @NotNull
+  public static final net.corda.core.utilities.NonEmptySet<T> toNonEmptySet(java.util.Collection<? extends T>)
+  public static final void trace(org.slf4j.Logger, kotlin.jvm.functions.Function0<String>)
+  @NotNull
+  public static final net.corda.core.utilities.PropertyDelegate<T> transient(kotlin.jvm.functions.Function0<? extends T>)
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.utilities.NetworkHostAndPort extends java.lang.Object
+@CordaSerializable
+public final class net.corda.core.utilities.NetworkHostAndPort extends java.lang.Object
   public <init>(String, int)
-  @org.jetbrains.annotations.NotNull public final String component1()
+  @NotNull
+  public final String component1()
   public final int component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.NetworkHostAndPort copy(String, int)
+  @NotNull
+  public final net.corda.core.utilities.NetworkHostAndPort copy(String, int)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final String getHost()
+  @NotNull
+  public final String getHost()
   public final int getPort()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.utilities.NetworkHostAndPort parse(String)
-  @org.jetbrains.annotations.NotNull public String toString()
+  @NotNull
+  public static final net.corda.core.utilities.NetworkHostAndPort parse(String)
+  @NotNull
+  public String toString()
   public static final net.corda.core.utilities.NetworkHostAndPort$Companion Companion
-  @org.jetbrains.annotations.NotNull public static final String INVALID_PORT_FORMAT = "Invalid port: %s"
-  @org.jetbrains.annotations.NotNull public static final String MISSING_PORT_FORMAT = "Missing port: %s"
-  @org.jetbrains.annotations.NotNull public static final String UNPARSEABLE_ADDRESS_FORMAT = "Unparseable address: %s"
+  @NotNull
+  public static final String INVALID_PORT_FORMAT = "Invalid port: %s"
+  @NotNull
+  public static final String MISSING_PORT_FORMAT = "Missing port: %s"
+  @NotNull
+  public static final String UNPARSEABLE_ADDRESS_FORMAT = "Unparseable address: %s"
 ##
 public static final class net.corda.core.utilities.NetworkHostAndPort$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.NetworkHostAndPort parse(String)
+  @NotNull
+  public final net.corda.core.utilities.NetworkHostAndPort parse(String)
 ##
 public final class net.corda.core.utilities.NonEmptySet extends java.lang.Object implements kotlin.jvm.internal.markers.KMappedMarker, java.util.Set
-  public boolean add(Object)
-  public boolean addAll(Collection)
+  public boolean add(T)
+  public boolean addAll(java.util.Collection<? extends T>)
   public void clear()
   public boolean contains(Object)
-  public boolean containsAll(Collection)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.utilities.NonEmptySet copyOf(Collection)
+  public boolean containsAll(java.util.Collection<?>)
+  @NotNull
+  public static final net.corda.core.utilities.NonEmptySet<T> copyOf(java.util.Collection<? extends T>)
   public boolean equals(Object)
-  public void forEach(function.Consumer)
+  public void forEach(java.util.function.Consumer<? super T>)
   public int getSize()
   public int hashCode()
-  public final Object head()
+  public final T head()
   public boolean isEmpty()
-  @org.jetbrains.annotations.NotNull public Iterator iterator()
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.utilities.NonEmptySet of(Object)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.utilities.NonEmptySet of(Object, Object, Object...)
-  @org.jetbrains.annotations.NotNull public stream.Stream parallelStream()
+  @NotNull
+  public java.util.Iterator<T> iterator()
+  @NotNull
+  public static final net.corda.core.utilities.NonEmptySet<T> of(T)
+  @NotNull
+  public static final net.corda.core.utilities.NonEmptySet<T> of(T, T, T...)
+  @NotNull
+  public java.util.stream.Stream<T> parallelStream()
   public boolean remove(Object)
-  public boolean removeAll(Collection)
-  public boolean retainAll(Collection)
-  @org.jetbrains.annotations.NotNull public Spliterator spliterator()
-  @org.jetbrains.annotations.NotNull public stream.Stream stream()
+  public boolean removeAll(java.util.Collection<?>)
+  public boolean retainAll(java.util.Collection<?>)
+  @NotNull
+  public java.util.Spliterator<T> spliterator()
+  @NotNull
+  public java.util.stream.Stream<T> stream()
   public Object[] toArray()
-  public Object[] toArray(Object[])
-  @org.jetbrains.annotations.NotNull public String toString()
+  public T[] toArray(T[])
+  @NotNull
+  public String toString()
   public static final net.corda.core.utilities.NonEmptySet$Companion Companion
 ##
 public static final class net.corda.core.utilities.NonEmptySet$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.NonEmptySet copyOf(Collection)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.NonEmptySet of(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.NonEmptySet of(Object, Object, Object...)
+  @NotNull
+  public final net.corda.core.utilities.NonEmptySet<T> copyOf(java.util.Collection<? extends T>)
+  @NotNull
+  public final net.corda.core.utilities.NonEmptySet<T> of(T)
+  @NotNull
+  public final net.corda.core.utilities.NonEmptySet<T> of(T, T, T...)
 ##
-public static final class net.corda.core.utilities.NonEmptySet$iterator$1 extends java.lang.Object implements java.util.Iterator, kotlin.jvm.internal.markers.KMappedMarker
-  public boolean hasNext()
-  public Object next()
-  public void remove()
-##
-@net.corda.core.serialization.CordaSerializable public class net.corda.core.utilities.OpaqueBytes extends net.corda.core.utilities.ByteSequence
+@CordaSerializable
+public class net.corda.core.utilities.OpaqueBytes extends net.corda.core.utilities.ByteSequence
   public <init>(byte[])
-  @org.jetbrains.annotations.NotNull public final byte[] getBytes()
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.utilities.OpaqueBytes of(byte...)
+  @NotNull
+  public final byte[] getBytes()
+  @NotNull
+  public static final net.corda.core.utilities.OpaqueBytes of(byte...)
   public static final net.corda.core.utilities.OpaqueBytes$Companion Companion
 ##
 public static final class net.corda.core.utilities.OpaqueBytes$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.OpaqueBytes of(byte...)
+  @NotNull
+  public final net.corda.core.utilities.OpaqueBytes of(byte...)
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.utilities.OpaqueBytesSubSequence extends net.corda.core.utilities.ByteSequence
+@CordaSerializable
+public final class net.corda.core.utilities.OpaqueBytesSubSequence extends net.corda.core.utilities.ByteSequence
   public <init>(byte[], int, int)
-  @org.jetbrains.annotations.NotNull public byte[] getBytes()
+  @NotNull
+  public byte[] getBytes()
 ##
-@net.corda.core.serialization.CordaSerializable public final class net.corda.core.utilities.ProgressTracker extends java.lang.Object
+@CordaSerializable
+public final class net.corda.core.utilities.ProgressTracker extends java.lang.Object
   public <init>(net.corda.core.utilities.ProgressTracker$Step...)
   public final void endWithError(Throwable)
-  @org.jetbrains.annotations.NotNull public final List getAllSteps()
-  @org.jetbrains.annotations.NotNull public final List getAllStepsLabels()
-  @org.jetbrains.annotations.NotNull public final rx.Observable getChanges()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.utilities.ProgressTracker getChildProgressTracker(net.corda.core.utilities.ProgressTracker$Step)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ProgressTracker$Step getCurrentStep()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ProgressTracker$Step getCurrentStepRecursive()
+  @NotNull
+  public final java.util.List<kotlin.Pair<Integer, net.corda.core.utilities.ProgressTracker$Step>> getAllSteps()
+  @NotNull
+  public final java.util.List<kotlin.Pair<Integer, String>> getAllStepsLabels()
+  @NotNull
+  public final rx.Observable<net.corda.core.utilities.ProgressTracker$Change> getChanges()
+  @Nullable
+  public final net.corda.core.utilities.ProgressTracker getChildProgressTracker(net.corda.core.utilities.ProgressTracker$Step)
+  @NotNull
+  public final net.corda.core.utilities.ProgressTracker$Step getCurrentStep()
+  @NotNull
+  public final net.corda.core.utilities.ProgressTracker$Step getCurrentStepRecursive()
   public final boolean getHasEnded()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.utilities.ProgressTracker getParent()
+  @Nullable
+  public final net.corda.core.utilities.ProgressTracker getParent()
   public final int getStepIndex()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ProgressTracker$Step[] getSteps()
-  @org.jetbrains.annotations.NotNull public final rx.Observable getStepsTreeChanges()
+  @NotNull
+  public final net.corda.core.utilities.ProgressTracker$Step[] getSteps()
+  @NotNull
+  public final rx.Observable<java.util.List<kotlin.Pair<Integer, String>>> getStepsTreeChanges()
   public final int getStepsTreeIndex()
-  @org.jetbrains.annotations.NotNull public final rx.Observable getStepsTreeIndexChanges()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ProgressTracker getTopLevelTracker()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ProgressTracker$Step nextStep()
+  @NotNull
+  public final rx.Observable<Integer> getStepsTreeIndexChanges()
+  @NotNull
+  public final net.corda.core.utilities.ProgressTracker getTopLevelTracker()
+  @NotNull
+  public final net.corda.core.utilities.ProgressTracker$Step nextStep()
   public final void setChildProgressTracker(net.corda.core.utilities.ProgressTracker$Step, net.corda.core.utilities.ProgressTracker)
   public final void setCurrentStep(net.corda.core.utilities.ProgressTracker$Step)
 ##
-@net.corda.core.serialization.CordaSerializable public abstract static class net.corda.core.utilities.ProgressTracker$Change extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ProgressTracker getProgressTracker()
+@CordaSerializable
+public abstract static class net.corda.core.utilities.ProgressTracker$Change extends java.lang.Object
+  @NotNull
+  public final net.corda.core.utilities.ProgressTracker getProgressTracker()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.utilities.ProgressTracker$Change$Position extends net.corda.core.utilities.ProgressTracker$Change
+@CordaSerializable
+public static final class net.corda.core.utilities.ProgressTracker$Change$Position extends net.corda.core.utilities.ProgressTracker$Change
   public <init>(net.corda.core.utilities.ProgressTracker, net.corda.core.utilities.ProgressTracker$Step)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ProgressTracker component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ProgressTracker$Step component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ProgressTracker$Change$Position copy(net.corda.core.utilities.ProgressTracker, net.corda.core.utilities.ProgressTracker$Step)
+  @NotNull
+  public final net.corda.core.utilities.ProgressTracker component1()
+  @NotNull
+  public final net.corda.core.utilities.ProgressTracker$Step component2()
+  @NotNull
+  public final net.corda.core.utilities.ProgressTracker$Change$Position copy(net.corda.core.utilities.ProgressTracker, net.corda.core.utilities.ProgressTracker$Step)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ProgressTracker$Step getNewStep()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ProgressTracker getTracker()
+  @NotNull
+  public final net.corda.core.utilities.ProgressTracker$Step getNewStep()
+  @NotNull
+  public final net.corda.core.utilities.ProgressTracker getTracker()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public String toString()
+  @NotNull
+  public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.utilities.ProgressTracker$Change$Rendering extends net.corda.core.utilities.ProgressTracker$Change
+@CordaSerializable
+public static final class net.corda.core.utilities.ProgressTracker$Change$Rendering extends net.corda.core.utilities.ProgressTracker$Change
   public <init>(net.corda.core.utilities.ProgressTracker, net.corda.core.utilities.ProgressTracker$Step)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ProgressTracker component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ProgressTracker$Step component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ProgressTracker$Change$Rendering copy(net.corda.core.utilities.ProgressTracker, net.corda.core.utilities.ProgressTracker$Step)
+  @NotNull
+  public final net.corda.core.utilities.ProgressTracker component1()
+  @NotNull
+  public final net.corda.core.utilities.ProgressTracker$Step component2()
+  @NotNull
+  public final net.corda.core.utilities.ProgressTracker$Change$Rendering copy(net.corda.core.utilities.ProgressTracker, net.corda.core.utilities.ProgressTracker$Step)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ProgressTracker$Step getOfStep()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ProgressTracker getTracker()
+  @NotNull
+  public final net.corda.core.utilities.ProgressTracker$Step getOfStep()
+  @NotNull
+  public final net.corda.core.utilities.ProgressTracker getTracker()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public String toString()
+  @NotNull
+  public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.utilities.ProgressTracker$Change$Structural extends net.corda.core.utilities.ProgressTracker$Change
+@CordaSerializable
+public static final class net.corda.core.utilities.ProgressTracker$Change$Structural extends net.corda.core.utilities.ProgressTracker$Change
   public <init>(net.corda.core.utilities.ProgressTracker, net.corda.core.utilities.ProgressTracker$Step)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ProgressTracker component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ProgressTracker$Step component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ProgressTracker$Change$Structural copy(net.corda.core.utilities.ProgressTracker, net.corda.core.utilities.ProgressTracker$Step)
+  @NotNull
+  public final net.corda.core.utilities.ProgressTracker component1()
+  @NotNull
+  public final net.corda.core.utilities.ProgressTracker$Step component2()
+  @NotNull
+  public final net.corda.core.utilities.ProgressTracker$Change$Structural copy(net.corda.core.utilities.ProgressTracker, net.corda.core.utilities.ProgressTracker$Step)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ProgressTracker$Step getParent()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ProgressTracker getTracker()
+  @NotNull
+  public final net.corda.core.utilities.ProgressTracker$Step getParent()
+  @NotNull
+  public final net.corda.core.utilities.ProgressTracker getTracker()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public String toString()
+  @NotNull
+  public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.utilities.ProgressTracker$DONE extends net.corda.core.utilities.ProgressTracker$Step
+@CordaSerializable
+public static final class net.corda.core.utilities.ProgressTracker$DONE extends net.corda.core.utilities.ProgressTracker$Step
   public boolean equals(Object)
   public static final net.corda.core.utilities.ProgressTracker$DONE INSTANCE
 ##
-@net.corda.core.serialization.CordaSerializable public static class net.corda.core.utilities.ProgressTracker$Step extends java.lang.Object
+@CordaSerializable
+public static class net.corda.core.utilities.ProgressTracker$Step extends java.lang.Object
   public <init>(String)
-  @org.jetbrains.annotations.Nullable public net.corda.core.utilities.ProgressTracker childProgressTracker()
-  @org.jetbrains.annotations.NotNull public rx.Observable getChanges()
-  @org.jetbrains.annotations.NotNull public Map getExtraAuditData()
-  @org.jetbrains.annotations.NotNull public String getLabel()
+  @Nullable
+  public net.corda.core.utilities.ProgressTracker childProgressTracker()
+  @NotNull
+  public rx.Observable<net.corda.core.utilities.ProgressTracker$Change> getChanges()
+  @NotNull
+  public java.util.Map<String, String> getExtraAuditData()
+  @NotNull
+  public String getLabel()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.utilities.ProgressTracker$UNSTARTED extends net.corda.core.utilities.ProgressTracker$Step
+@CordaSerializable
+public static final class net.corda.core.utilities.ProgressTracker$UNSTARTED extends net.corda.core.utilities.ProgressTracker$Step
   public boolean equals(Object)
   public static final net.corda.core.utilities.ProgressTracker$UNSTARTED INSTANCE
 ##
 public interface net.corda.core.utilities.PropertyDelegate
+<<<<<<< HEAD
   public abstract Object getValue(Object, kotlin.reflect.KProperty)
 ##
 public final class net.corda.core.utilities.SgxSupport extends java.lang.Object
@@ -3569,82 +5510,118 @@ public final class net.corda.core.utilities.SgxSupport extends java.lang.Object
   @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.Try combine(net.corda.core.utilities.Try, kotlin.jvm.functions.Function2)
   @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.Try flatMap(kotlin.jvm.functions.Function1)
   public abstract Object getOrThrow()
+=======
+  public abstract T getValue(Object, kotlin.reflect.KProperty<?>)
+##
+@CordaSerializable
+public abstract class net.corda.core.utilities.Try extends java.lang.Object
+  @NotNull
+  public final net.corda.core.utilities.Try<C> combine(net.corda.core.utilities.Try<? extends B>, kotlin.jvm.functions.Function2<? super A, ? super B, ? extends C>)
+  @NotNull
+  public final net.corda.core.utilities.Try<B> flatMap(kotlin.jvm.functions.Function1<? super A, ? extends net.corda.core.utilities.Try<? extends B>>)
+  public abstract A getOrThrow()
+>>>>>>> open/master
   public abstract boolean isFailure()
   public abstract boolean isSuccess()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.Try map(kotlin.jvm.functions.Function1)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.utilities.Try on(kotlin.jvm.functions.Function0)
+  @NotNull
+  public final net.corda.core.utilities.Try<B> map(kotlin.jvm.functions.Function1<? super A, ? extends B>)
+  @NotNull
+  public static final net.corda.core.utilities.Try<T> on(kotlin.jvm.functions.Function0<? extends T>)
   public static final net.corda.core.utilities.Try$Companion Companion
 ##
 public static final class net.corda.core.utilities.Try$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.Try on(kotlin.jvm.functions.Function0)
+  @NotNull
+  public final net.corda.core.utilities.Try<T> on(kotlin.jvm.functions.Function0<? extends T>)
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.utilities.Try$Failure extends net.corda.core.utilities.Try
+@CordaSerializable
+public static final class net.corda.core.utilities.Try$Failure extends net.corda.core.utilities.Try
   public <init>(Throwable)
-  @org.jetbrains.annotations.NotNull public final Throwable component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.Try$Failure copy(Throwable)
+  @NotNull
+  public final Throwable component1()
+  @NotNull
+  public final net.corda.core.utilities.Try$Failure<A> copy(Throwable)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final Throwable getException()
-  public Object getOrThrow()
+  @NotNull
+  public final Throwable getException()
+  public A getOrThrow()
   public int hashCode()
   public boolean isFailure()
   public boolean isSuccess()
-  @org.jetbrains.annotations.NotNull public String toString()
+  @NotNull
+  public String toString()
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.core.utilities.Try$Success extends net.corda.core.utilities.Try
-  public <init>(Object)
-  public final Object component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.Try$Success copy(Object)
+@CordaSerializable
+public static final class net.corda.core.utilities.Try$Success extends net.corda.core.utilities.Try
+  public <init>(A)
+  public final A component1()
+  @NotNull
+  public final net.corda.core.utilities.Try$Success<A> copy(A)
   public boolean equals(Object)
-  public Object getOrThrow()
-  public final Object getValue()
+  public A getOrThrow()
+  public final A getValue()
   public int hashCode()
   public boolean isFailure()
   public boolean isSuccess()
-  @org.jetbrains.annotations.NotNull public String toString()
+  @NotNull
+  public String toString()
 ##
 public final class net.corda.core.utilities.UntrustworthyData extends java.lang.Object
-  public <init>(Object)
-  public final Object getFromUntrustedWorld()
-  @co.paralleluniverse.fibers.Suspendable public final Object unwrap(net.corda.core.utilities.UntrustworthyData$Validator)
+  public <init>(T)
+  public final T getFromUntrustedWorld()
+  @Suspendable
+  public final R unwrap(net.corda.core.utilities.UntrustworthyData$Validator<? super T, ? extends R>)
 ##
 public static interface net.corda.core.utilities.UntrustworthyData$Validator extends java.io.Serializable
-  @co.paralleluniverse.fibers.Suspendable public abstract Object validate(Object)
+  @Suspendable
+  public abstract R validate(T)
 ##
 public final class net.corda.core.utilities.UntrustworthyDataKt extends java.lang.Object
-  public static final Object unwrap(net.corda.core.utilities.UntrustworthyData, kotlin.jvm.functions.Function1)
+  public static final R unwrap(net.corda.core.utilities.UntrustworthyData<? extends T>, kotlin.jvm.functions.Function1<? super T, ? extends R>)
 ##
 public final class net.corda.core.utilities.UuidGenerator extends java.lang.Object
   public <init>()
   public static final net.corda.core.utilities.UuidGenerator$Companion Companion
 ##
 public static final class net.corda.core.utilities.UuidGenerator$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final UUID next()
+  @NotNull
+  public final java.util.UUID next()
 ##
 public interface net.corda.core.utilities.VariablePropertyDelegate extends net.corda.core.utilities.PropertyDelegate
-  public abstract void setValue(Object, kotlin.reflect.KProperty, Object)
+  public abstract void setValue(Object, kotlin.reflect.KProperty<?>, T)
 ##
 public final class net.corda.client.jackson.JacksonSupport extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public static final com.fasterxml.jackson.databind.ObjectMapper createDefaultMapper(net.corda.core.messaging.CordaRPCOps)
-  @org.jetbrains.annotations.NotNull public static final com.fasterxml.jackson.databind.ObjectMapper createDefaultMapper(net.corda.core.messaging.CordaRPCOps, com.fasterxml.jackson.core.JsonFactory)
-  @org.jetbrains.annotations.NotNull public static final com.fasterxml.jackson.databind.ObjectMapper createDefaultMapper(net.corda.core.messaging.CordaRPCOps, com.fasterxml.jackson.core.JsonFactory, boolean)
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public static final com.fasterxml.jackson.databind.ObjectMapper createInMemoryMapper(net.corda.core.node.services.IdentityService)
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public static final com.fasterxml.jackson.databind.ObjectMapper createInMemoryMapper(net.corda.core.node.services.IdentityService, com.fasterxml.jackson.core.JsonFactory)
-  @kotlin.Deprecated @org.jetbrains.annotations.NotNull public static final com.fasterxml.jackson.databind.ObjectMapper createInMemoryMapper(net.corda.core.node.services.IdentityService, com.fasterxml.jackson.core.JsonFactory, boolean)
-  @org.jetbrains.annotations.NotNull public static final com.fasterxml.jackson.databind.ObjectMapper createNonRpcMapper()
-  @org.jetbrains.annotations.NotNull public static final com.fasterxml.jackson.databind.ObjectMapper createNonRpcMapper(com.fasterxml.jackson.core.JsonFactory)
-  @org.jetbrains.annotations.NotNull public final com.fasterxml.jackson.databind.Module getCordaModule()
+  @NotNull
+  public static final com.fasterxml.jackson.databind.ObjectMapper createDefaultMapper(net.corda.core.messaging.CordaRPCOps)
+  @NotNull
+  public static final com.fasterxml.jackson.databind.ObjectMapper createDefaultMapper(net.corda.core.messaging.CordaRPCOps, com.fasterxml.jackson.core.JsonFactory)
+  @NotNull
+  public static final com.fasterxml.jackson.databind.ObjectMapper createDefaultMapper(net.corda.core.messaging.CordaRPCOps, com.fasterxml.jackson.core.JsonFactory, boolean)
+  @NotNull
+  public static final com.fasterxml.jackson.databind.ObjectMapper createInMemoryMapper(net.corda.core.node.services.IdentityService)
+  @NotNull
+  public static final com.fasterxml.jackson.databind.ObjectMapper createInMemoryMapper(net.corda.core.node.services.IdentityService, com.fasterxml.jackson.core.JsonFactory)
+  @NotNull
+  public static final com.fasterxml.jackson.databind.ObjectMapper createInMemoryMapper(net.corda.core.node.services.IdentityService, com.fasterxml.jackson.core.JsonFactory, boolean)
+  @NotNull
+  public static final com.fasterxml.jackson.databind.ObjectMapper createNonRpcMapper()
+  @NotNull
+  public static final com.fasterxml.jackson.databind.ObjectMapper createNonRpcMapper(com.fasterxml.jackson.core.JsonFactory)
+  @NotNull
+  public final com.fasterxml.jackson.databind.Module getCordaModule()
   public static final net.corda.client.jackson.JacksonSupport INSTANCE
 ##
 public static final class net.corda.client.jackson.JacksonSupport$AmountDeserializer extends com.fasterxml.jackson.databind.JsonDeserializer
-  @org.jetbrains.annotations.NotNull public net.corda.core.contracts.Amount deserialize(com.fasterxml.jackson.core.JsonParser, com.fasterxml.jackson.databind.DeserializationContext)
+  @NotNull
+  public net.corda.core.contracts.Amount<?> deserialize(com.fasterxml.jackson.core.JsonParser, com.fasterxml.jackson.databind.DeserializationContext)
   public static final net.corda.client.jackson.JacksonSupport$AmountDeserializer INSTANCE
 ##
 public static final class net.corda.client.jackson.JacksonSupport$AmountSerializer extends com.fasterxml.jackson.databind.JsonSerializer
-  public void serialize(net.corda.core.contracts.Amount, com.fasterxml.jackson.core.JsonGenerator, com.fasterxml.jackson.databind.SerializerProvider)
+  public void serialize(net.corda.core.contracts.Amount<?>, com.fasterxml.jackson.core.JsonGenerator, com.fasterxml.jackson.databind.SerializerProvider)
   public static final net.corda.client.jackson.JacksonSupport$AmountSerializer INSTANCE
 ##
 public static final class net.corda.client.jackson.JacksonSupport$AnonymousPartyDeserializer extends com.fasterxml.jackson.databind.JsonDeserializer
-  @org.jetbrains.annotations.NotNull public net.corda.core.identity.AnonymousParty deserialize(com.fasterxml.jackson.core.JsonParser, com.fasterxml.jackson.databind.DeserializationContext)
+  @NotNull
+  public net.corda.core.identity.AnonymousParty deserialize(com.fasterxml.jackson.core.JsonParser, com.fasterxml.jackson.databind.DeserializationContext)
   public static final net.corda.client.jackson.JacksonSupport$AnonymousPartyDeserializer INSTANCE
 ##
 public static final class net.corda.client.jackson.JacksonSupport$AnonymousPartySerializer extends com.fasterxml.jackson.databind.JsonSerializer
@@ -3652,29 +5629,39 @@ public static final class net.corda.client.jackson.JacksonSupport$AnonymousParty
   public static final net.corda.client.jackson.JacksonSupport$AnonymousPartySerializer INSTANCE
 ##
 public static final class net.corda.client.jackson.JacksonSupport$CordaX500NameDeserializer extends com.fasterxml.jackson.databind.JsonDeserializer
-  @org.jetbrains.annotations.NotNull public net.corda.core.identity.CordaX500Name deserialize(com.fasterxml.jackson.core.JsonParser, com.fasterxml.jackson.databind.DeserializationContext)
+  @NotNull
+  public net.corda.core.identity.CordaX500Name deserialize(com.fasterxml.jackson.core.JsonParser, com.fasterxml.jackson.databind.DeserializationContext)
   public static final net.corda.client.jackson.JacksonSupport$CordaX500NameDeserializer INSTANCE
 ##
 public static final class net.corda.client.jackson.JacksonSupport$CordaX500NameSerializer extends com.fasterxml.jackson.databind.JsonSerializer
   public void serialize(net.corda.core.identity.CordaX500Name, com.fasterxml.jackson.core.JsonGenerator, com.fasterxml.jackson.databind.SerializerProvider)
   public static final net.corda.client.jackson.JacksonSupport$CordaX500NameSerializer INSTANCE
 ##
-@net.corda.core.DoNotImplement public static final class net.corda.client.jackson.JacksonSupport$IdentityObjectMapper extends com.fasterxml.jackson.databind.ObjectMapper implements net.corda.client.jackson.JacksonSupport$PartyObjectMapper
+public static final class net.corda.client.jackson.JacksonSupport$IdentityObjectMapper extends com.fasterxml.jackson.databind.ObjectMapper implements net.corda.client.jackson.JacksonSupport$PartyObjectMapper
   public <init>(net.corda.core.node.services.IdentityService, com.fasterxml.jackson.core.JsonFactory, boolean)
   public final boolean getFuzzyIdentityMatch()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.services.IdentityService getIdentityService()
-  @org.jetbrains.annotations.NotNull public Set partiesFromName(String)
-  @org.jetbrains.annotations.Nullable public net.corda.core.identity.Party partyFromKey(java.security.PublicKey)
-  @org.jetbrains.annotations.Nullable public net.corda.core.identity.Party wellKnownPartyFromX500Name(net.corda.core.identity.CordaX500Name)
+  @NotNull
+  public final net.corda.core.node.services.IdentityService getIdentityService()
+  @NotNull
+  public java.util.Set<net.corda.core.identity.Party> partiesFromName(String)
+  @Nullable
+  public net.corda.core.identity.Party partyFromKey(java.security.PublicKey)
+  @Nullable
+  public net.corda.core.identity.Party wellKnownPartyFromX500Name(net.corda.core.identity.CordaX500Name)
 ##
-@net.corda.core.DoNotImplement public static final class net.corda.client.jackson.JacksonSupport$NoPartyObjectMapper extends com.fasterxml.jackson.databind.ObjectMapper implements net.corda.client.jackson.JacksonSupport$PartyObjectMapper
+@DoNotImplement
+public static final class net.corda.client.jackson.JacksonSupport$NoPartyObjectMapper extends com.fasterxml.jackson.databind.ObjectMapper implements net.corda.client.jackson.JacksonSupport$PartyObjectMapper
   public <init>(com.fasterxml.jackson.core.JsonFactory)
-  @org.jetbrains.annotations.NotNull public Set partiesFromName(String)
-  @org.jetbrains.annotations.Nullable public net.corda.core.identity.Party partyFromKey(java.security.PublicKey)
-  @org.jetbrains.annotations.Nullable public net.corda.core.identity.Party wellKnownPartyFromX500Name(net.corda.core.identity.CordaX500Name)
+  @NotNull
+  public java.util.Set<net.corda.core.identity.Party> partiesFromName(String)
+  @Nullable
+  public net.corda.core.identity.Party partyFromKey(java.security.PublicKey)
+  @Nullable
+  public net.corda.core.identity.Party wellKnownPartyFromX500Name(net.corda.core.identity.CordaX500Name)
 ##
 public static final class net.corda.client.jackson.JacksonSupport$NodeInfoDeserializer extends com.fasterxml.jackson.databind.JsonDeserializer
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.NodeInfo deserialize(com.fasterxml.jackson.core.JsonParser, com.fasterxml.jackson.databind.DeserializationContext)
+  @NotNull
+  public net.corda.core.node.NodeInfo deserialize(com.fasterxml.jackson.core.JsonParser, com.fasterxml.jackson.databind.DeserializationContext)
   public static final net.corda.client.jackson.JacksonSupport$NodeInfoDeserializer INSTANCE
 ##
 public static final class net.corda.client.jackson.JacksonSupport$NodeInfoSerializer extends com.fasterxml.jackson.databind.JsonSerializer
@@ -3682,7 +5669,8 @@ public static final class net.corda.client.jackson.JacksonSupport$NodeInfoSerial
   public static final net.corda.client.jackson.JacksonSupport$NodeInfoSerializer INSTANCE
 ##
 public static final class net.corda.client.jackson.JacksonSupport$OpaqueBytesDeserializer extends com.fasterxml.jackson.databind.JsonDeserializer
-  @org.jetbrains.annotations.NotNull public net.corda.core.utilities.OpaqueBytes deserialize(com.fasterxml.jackson.core.JsonParser, com.fasterxml.jackson.databind.DeserializationContext)
+  @NotNull
+  public net.corda.core.utilities.OpaqueBytes deserialize(com.fasterxml.jackson.core.JsonParser, com.fasterxml.jackson.databind.DeserializationContext)
   public static final net.corda.client.jackson.JacksonSupport$OpaqueBytesDeserializer INSTANCE
 ##
 public static final class net.corda.client.jackson.JacksonSupport$OpaqueBytesSerializer extends com.fasterxml.jackson.databind.JsonSerializer
@@ -3690,37 +5678,47 @@ public static final class net.corda.client.jackson.JacksonSupport$OpaqueBytesSer
   public static final net.corda.client.jackson.JacksonSupport$OpaqueBytesSerializer INSTANCE
 ##
 public static final class net.corda.client.jackson.JacksonSupport$PartyDeserializer extends com.fasterxml.jackson.databind.JsonDeserializer
-  @org.jetbrains.annotations.NotNull public net.corda.core.identity.Party deserialize(com.fasterxml.jackson.core.JsonParser, com.fasterxml.jackson.databind.DeserializationContext)
+  @NotNull
+  public net.corda.core.identity.Party deserialize(com.fasterxml.jackson.core.JsonParser, com.fasterxml.jackson.databind.DeserializationContext)
   public static final net.corda.client.jackson.JacksonSupport$PartyDeserializer INSTANCE
 ##
-@net.corda.core.DoNotImplement public static interface net.corda.client.jackson.JacksonSupport$PartyObjectMapper
-  @org.jetbrains.annotations.NotNull public abstract Set partiesFromName(String)
-  @org.jetbrains.annotations.Nullable public abstract net.corda.core.identity.Party partyFromKey(java.security.PublicKey)
-  @org.jetbrains.annotations.Nullable public abstract net.corda.core.identity.Party wellKnownPartyFromX500Name(net.corda.core.identity.CordaX500Name)
+public static interface net.corda.client.jackson.JacksonSupport$PartyObjectMapper
+  @NotNull
+  public abstract java.util.Set<net.corda.core.identity.Party> partiesFromName(String)
+  @Nullable
+  public abstract net.corda.core.identity.Party partyFromKey(java.security.PublicKey)
+  @Nullable
+  public abstract net.corda.core.identity.Party wellKnownPartyFromX500Name(net.corda.core.identity.CordaX500Name)
 ##
 public static final class net.corda.client.jackson.JacksonSupport$PartySerializer extends com.fasterxml.jackson.databind.JsonSerializer
   public void serialize(net.corda.core.identity.Party, com.fasterxml.jackson.core.JsonGenerator, com.fasterxml.jackson.databind.SerializerProvider)
   public static final net.corda.client.jackson.JacksonSupport$PartySerializer INSTANCE
 ##
 public static final class net.corda.client.jackson.JacksonSupport$PublicKeyDeserializer extends com.fasterxml.jackson.databind.JsonDeserializer
-  @org.jetbrains.annotations.NotNull public java.security.PublicKey deserialize(com.fasterxml.jackson.core.JsonParser, com.fasterxml.jackson.databind.DeserializationContext)
+  @NotNull
+  public java.security.PublicKey deserialize(com.fasterxml.jackson.core.JsonParser, com.fasterxml.jackson.databind.DeserializationContext)
   public static final net.corda.client.jackson.JacksonSupport$PublicKeyDeserializer INSTANCE
 ##
 public static final class net.corda.client.jackson.JacksonSupport$PublicKeySerializer extends com.fasterxml.jackson.databind.JsonSerializer
   public void serialize(java.security.PublicKey, com.fasterxml.jackson.core.JsonGenerator, com.fasterxml.jackson.databind.SerializerProvider)
   public static final net.corda.client.jackson.JacksonSupport$PublicKeySerializer INSTANCE
 ##
-@net.corda.core.DoNotImplement public static final class net.corda.client.jackson.JacksonSupport$RpcObjectMapper extends com.fasterxml.jackson.databind.ObjectMapper implements net.corda.client.jackson.JacksonSupport$PartyObjectMapper
+public static final class net.corda.client.jackson.JacksonSupport$RpcObjectMapper extends com.fasterxml.jackson.databind.ObjectMapper implements net.corda.client.jackson.JacksonSupport$PartyObjectMapper
   public <init>(net.corda.core.messaging.CordaRPCOps, com.fasterxml.jackson.core.JsonFactory, boolean)
   public final boolean getFuzzyIdentityMatch()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.messaging.CordaRPCOps getRpc()
-  @org.jetbrains.annotations.NotNull public Set partiesFromName(String)
-  @org.jetbrains.annotations.Nullable public net.corda.core.identity.Party partyFromKey(java.security.PublicKey)
-  @org.jetbrains.annotations.Nullable public net.corda.core.identity.Party wellKnownPartyFromX500Name(net.corda.core.identity.CordaX500Name)
+  @NotNull
+  public final net.corda.core.messaging.CordaRPCOps getRpc()
+  @NotNull
+  public java.util.Set<net.corda.core.identity.Party> partiesFromName(String)
+  @Nullable
+  public net.corda.core.identity.Party partyFromKey(java.security.PublicKey)
+  @Nullable
+  public net.corda.core.identity.Party wellKnownPartyFromX500Name(net.corda.core.identity.CordaX500Name)
 ##
 public static final class net.corda.client.jackson.JacksonSupport$SecureHashDeserializer extends com.fasterxml.jackson.databind.JsonDeserializer
   public <init>()
-  @org.jetbrains.annotations.NotNull public net.corda.core.crypto.SecureHash deserialize(com.fasterxml.jackson.core.JsonParser, com.fasterxml.jackson.databind.DeserializationContext)
+  @NotNull
+  public T deserialize(com.fasterxml.jackson.core.JsonParser, com.fasterxml.jackson.databind.DeserializationContext)
 ##
 public static final class net.corda.client.jackson.JacksonSupport$SecureHashSerializer extends com.fasterxml.jackson.databind.JsonSerializer
   public void serialize(net.corda.core.crypto.SecureHash, com.fasterxml.jackson.core.JsonGenerator, com.fasterxml.jackson.databind.SerializerProvider)
@@ -3728,15 +5726,33 @@ public static final class net.corda.client.jackson.JacksonSupport$SecureHashSeri
 ##
 public abstract static class net.corda.client.jackson.JacksonSupport$SignedTransactionMixin extends java.lang.Object
   public <init>()
-  @com.fasterxml.jackson.annotation.JsonIgnore @org.jetbrains.annotations.NotNull public abstract net.corda.core.crypto.SecureHash getId()
-  @com.fasterxml.jackson.annotation.JsonIgnore @org.jetbrains.annotations.NotNull public abstract List getInputs()
-  @com.fasterxml.jackson.annotation.JsonIgnore @org.jetbrains.annotations.Nullable public abstract net.corda.core.identity.Party getNotary()
-  @com.fasterxml.jackson.annotation.JsonIgnore @org.jetbrains.annotations.NotNull public abstract net.corda.core.transactions.NotaryChangeWireTransaction getNotaryChangeTx()
-  @com.fasterxml.jackson.annotation.JsonIgnore @org.jetbrains.annotations.NotNull public abstract Set getRequiredSigningKeys()
-  @com.fasterxml.jackson.annotation.JsonProperty @org.jetbrains.annotations.NotNull protected abstract List getSigs()
-  @com.fasterxml.jackson.annotation.JsonProperty @org.jetbrains.annotations.NotNull protected abstract net.corda.core.transactions.CoreTransaction getTransaction()
-  @com.fasterxml.jackson.annotation.JsonIgnore @org.jetbrains.annotations.NotNull public abstract net.corda.core.transactions.WireTransaction getTx()
-  @com.fasterxml.jackson.annotation.JsonIgnore @org.jetbrains.annotations.NotNull public abstract net.corda.core.serialization.SerializedBytes getTxBits()
+  @JsonIgnore
+  @NotNull
+  public abstract net.corda.core.crypto.SecureHash getId()
+  @JsonIgnore
+  @NotNull
+  public abstract java.util.List<net.corda.core.contracts.StateRef> getInputs()
+  @JsonIgnore
+  @Nullable
+  public abstract net.corda.core.identity.Party getNotary()
+  @JsonIgnore
+  @NotNull
+  public abstract net.corda.core.transactions.NotaryChangeWireTransaction getNotaryChangeTx()
+  @JsonIgnore
+  @NotNull
+  public abstract java.util.Set<java.security.PublicKey> getRequiredSigningKeys()
+  @JsonProperty
+  @NotNull
+  protected abstract java.util.List<net.corda.core.crypto.TransactionSignature> getSigs()
+  @JsonProperty
+  @NotNull
+  protected abstract net.corda.core.transactions.CoreTransaction getTransaction()
+  @JsonIgnore
+  @NotNull
+  public abstract net.corda.core.transactions.WireTransaction getTx()
+  @JsonIgnore
+  @NotNull
+  public abstract net.corda.core.serialization.SerializedBytes<net.corda.core.transactions.CoreTransaction> getTxBits()
 ##
 public static final class net.corda.client.jackson.JacksonSupport$ToStringSerializer extends com.fasterxml.jackson.databind.JsonSerializer
   public void serialize(Object, com.fasterxml.jackson.core.JsonGenerator, com.fasterxml.jackson.databind.SerializerProvider)
@@ -3744,32 +5760,52 @@ public static final class net.corda.client.jackson.JacksonSupport$ToStringSerial
 ##
 public abstract static class net.corda.client.jackson.JacksonSupport$WireTransactionMixin extends java.lang.Object
   public <init>()
-  @com.fasterxml.jackson.annotation.JsonIgnore @org.jetbrains.annotations.NotNull public abstract List getAvailableComponentHashes()
-  @com.fasterxml.jackson.annotation.JsonIgnore @org.jetbrains.annotations.NotNull public abstract List getAvailableComponents()
-  @com.fasterxml.jackson.annotation.JsonIgnore @org.jetbrains.annotations.NotNull public abstract net.corda.core.crypto.MerkleTree getMerkleTree()
-  @com.fasterxml.jackson.annotation.JsonIgnore @org.jetbrains.annotations.NotNull public abstract List getOutputStates()
+  @JsonIgnore
+  @NotNull
+  public abstract java.util.List<net.corda.core.crypto.SecureHash> getAvailableComponentHashes()
+  @JsonIgnore
+  @NotNull
+  public abstract java.util.List<Object> getAvailableComponents()
+  @JsonIgnore
+  @NotNull
+  public abstract net.corda.core.crypto.MerkleTree getMerkleTree()
+  @JsonIgnore
+  @NotNull
+  public abstract java.util.List<net.corda.core.contracts.ContractState> getOutputStates()
 ##
-@javax.annotation.concurrent.ThreadSafe public class net.corda.client.jackson.StringToMethodCallParser extends java.lang.Object
-  public <init>(Class)
-  public <init>(Class, com.fasterxml.jackson.databind.ObjectMapper)
-  public <init>(kotlin.reflect.KClass)
-  @org.jetbrains.annotations.NotNull public final Map getAvailableCommands()
-  @org.jetbrains.annotations.NotNull protected final com.google.common.collect.Multimap getMethodMap()
-  @org.jetbrains.annotations.NotNull public final Map getMethodParamNames()
-  @org.jetbrains.annotations.NotNull public List paramNamesFromConstructor(reflect.Constructor)
-  @org.jetbrains.annotations.NotNull public List paramNamesFromMethod(reflect.Method)
-  @org.jetbrains.annotations.NotNull public final net.corda.client.jackson.StringToMethodCallParser$ParsedMethodCall parse(Object, String)
-  @org.jetbrains.annotations.NotNull public final Object[] parseArguments(String, List, String)
+@ThreadSafe
+public class net.corda.client.jackson.StringToMethodCallParser extends java.lang.Object
+  public <init>(Class<? extends T>)
+  public <init>(Class<? extends T>, com.fasterxml.jackson.databind.ObjectMapper)
+  public <init>(kotlin.reflect.KClass<? extends T>)
+  @NotNull
+  public final java.util.Map<String, String> getAvailableCommands()
+  @NotNull
+  protected final com.google.common.collect.Multimap<String, reflect.Method> getMethodMap()
+  @NotNull
+  public final java.util.Map<String, java.util.List<String>> getMethodParamNames()
+  @NotNull
+  public java.util.List<String> paramNamesFromConstructor(reflect.Constructor<?>)
+  @NotNull
+  public java.util.List<String> paramNamesFromMethod(reflect.Method)
+  @NotNull
+  public final net.corda.client.jackson.StringToMethodCallParser<T>$ParsedMethodCall parse(T, String)
+  @NotNull
+  public final Object[] parseArguments(String, java.util.List<? extends kotlin.Pair<String, ? extends Class<?>>>, String)
   public static final net.corda.client.jackson.StringToMethodCallParser$Companion Companion
 ##
 public static final class net.corda.client.jackson.StringToMethodCallParser$Companion extends java.lang.Object
 ##
 public final class net.corda.client.jackson.StringToMethodCallParser$ParsedMethodCall extends java.lang.Object implements java.util.concurrent.Callable
-  public <init>(net.corda.client.jackson.StringToMethodCallParser, Object, reflect.Method, Object[])
-  @org.jetbrains.annotations.Nullable public Object call()
-  @org.jetbrains.annotations.NotNull public final Object[] getArgs()
-  @org.jetbrains.annotations.NotNull public final reflect.Method getMethod()
-  @org.jetbrains.annotations.Nullable public final Object invoke()
+  public <init>(T, reflect.Method, Object[])
+  @Nullable
+  public Object call()
+  @NotNull
+  public final Object[] getArgs()
+  @NotNull
+  public final reflect.Method getMethod()
+  @Nullable
+  public final Object invoke()
 ##
 public static class net.corda.client.jackson.StringToMethodCallParser$UnparseableCallException extends net.corda.core.CordaException
   public <init>(String, Throwable)
@@ -3779,7 +5815,8 @@ public static final class net.corda.client.jackson.StringToMethodCallParser$Unpa
 ##
 public static final class net.corda.client.jackson.StringToMethodCallParser$UnparseableCallException$MissingParameter extends net.corda.client.jackson.StringToMethodCallParser$UnparseableCallException
   public <init>(String, String, String)
-  @org.jetbrains.annotations.NotNull public final String getParamName()
+  @NotNull
+  public final String getParamName()
 ##
 public static final class net.corda.client.jackson.StringToMethodCallParser$UnparseableCallException$ReflectionDataMissing extends net.corda.client.jackson.StringToMethodCallParser$UnparseableCallException
   public <init>(String, int)
@@ -3789,262 +5826,406 @@ public static final class net.corda.client.jackson.StringToMethodCallParser$Unpa
 ##
 public static final class net.corda.client.jackson.StringToMethodCallParser$UnparseableCallException$UnknownMethod extends net.corda.client.jackson.StringToMethodCallParser$UnparseableCallException
   public <init>(String)
-  @org.jetbrains.annotations.NotNull public final String getMethodName()
+  @NotNull
+  public final String getMethodName()
 ##
 public final class net.corda.testing.driver.Driver extends java.lang.Object
-  public static final Object driver(net.corda.testing.driver.DriverParameters, kotlin.jvm.functions.Function1)
+  public static final A driver(net.corda.testing.driver.DriverParameters, kotlin.jvm.functions.Function1<? super net.corda.testing.driver.DriverDSL, ? extends A>)
 ##
-@net.corda.core.DoNotImplement public interface net.corda.testing.driver.DriverDSL
-  @org.jetbrains.annotations.NotNull public abstract java.nio.file.Path baseDirectory(net.corda.core.identity.CordaX500Name)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.testing.driver.NotaryHandle getDefaultNotaryHandle()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.identity.Party getDefaultNotaryIdentity()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.concurrent.CordaFuture getDefaultNotaryNode()
-  @org.jetbrains.annotations.NotNull public abstract List getNotaryHandles()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.concurrent.CordaFuture startNode(net.corda.testing.driver.NodeParameters)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.concurrent.CordaFuture startNode(net.corda.testing.driver.NodeParameters, net.corda.core.identity.CordaX500Name, List, net.corda.testing.driver.VerifierType, Map, Boolean, String)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.concurrent.CordaFuture startWebserver(net.corda.testing.driver.NodeHandle)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.concurrent.CordaFuture startWebserver(net.corda.testing.driver.NodeHandle, String)
+@DoNotImplement
+public interface net.corda.testing.driver.DriverDSL
+  @NotNull
+  public abstract java.nio.file.Path baseDirectory(net.corda.core.identity.CordaX500Name)
+  @NotNull
+  public abstract net.corda.testing.driver.NotaryHandle getDefaultNotaryHandle()
+  @NotNull
+  public abstract net.corda.core.identity.Party getDefaultNotaryIdentity()
+  @NotNull
+  public abstract net.corda.core.concurrent.CordaFuture<net.corda.testing.driver.NodeHandle> getDefaultNotaryNode()
+  @NotNull
+  public abstract java.util.List<net.corda.testing.driver.NotaryHandle> getNotaryHandles()
+  @NotNull
+  public abstract net.corda.core.concurrent.CordaFuture<net.corda.testing.driver.NodeHandle> startNode(net.corda.testing.driver.NodeParameters)
+  @NotNull
+  public abstract net.corda.core.concurrent.CordaFuture<net.corda.testing.driver.NodeHandle> startNode(net.corda.testing.driver.NodeParameters, net.corda.core.identity.CordaX500Name, java.util.List<net.corda.testing.node.User>, net.corda.testing.driver.VerifierType, java.util.Map<String, ?>, Boolean, String)
+  @NotNull
+  public abstract net.corda.core.concurrent.CordaFuture<net.corda.testing.driver.WebserverHandle> startWebserver(net.corda.testing.driver.NodeHandle)
+  @NotNull
+  public abstract net.corda.core.concurrent.CordaFuture<net.corda.testing.driver.WebserverHandle> startWebserver(net.corda.testing.driver.NodeHandle, String)
 ##
 public final class net.corda.testing.driver.DriverParameters extends java.lang.Object
   public <init>()
-  public <init>(boolean, java.nio.file.Path, net.corda.testing.driver.PortAllocation, net.corda.testing.driver.PortAllocation, Map, boolean, boolean, boolean, List, List, net.corda.testing.driver.JmxPolicy, net.corda.core.node.NetworkParameters)
+  public <init>(boolean, java.nio.file.Path, net.corda.testing.driver.PortAllocation, net.corda.testing.driver.PortAllocation, java.util.Map<String, String>, boolean, boolean, boolean, java.util.List<net.corda.testing.node.NotarySpec>, java.util.List<String>, net.corda.testing.driver.JmxPolicy, net.corda.core.node.NetworkParameters)
   public final boolean component1()
-  @org.jetbrains.annotations.NotNull public final List component10()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.driver.JmxPolicy component11()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.NetworkParameters component12()
-  @org.jetbrains.annotations.NotNull public final java.nio.file.Path component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.driver.PortAllocation component3()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.driver.PortAllocation component4()
-  @org.jetbrains.annotations.NotNull public final Map component5()
+  @NotNull
+  public final java.util.List<String> component10()
+  @NotNull
+  public final net.corda.testing.driver.JmxPolicy component11()
+  @NotNull
+  public final net.corda.core.node.NetworkParameters component12()
+  @NotNull
+  public final java.nio.file.Path component2()
+  @NotNull
+  public final net.corda.testing.driver.PortAllocation component3()
+  @NotNull
+  public final net.corda.testing.driver.PortAllocation component4()
+  @NotNull
+  public final java.util.Map<String, String> component5()
   public final boolean component6()
   public final boolean component7()
   public final boolean component8()
-  @org.jetbrains.annotations.NotNull public final List component9()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.driver.DriverParameters copy(boolean, java.nio.file.Path, net.corda.testing.driver.PortAllocation, net.corda.testing.driver.PortAllocation, Map, boolean, boolean, boolean, List, List, net.corda.testing.driver.JmxPolicy, net.corda.core.node.NetworkParameters)
+  @NotNull
+  public final java.util.List<net.corda.testing.node.NotarySpec> component9()
+  @NotNull
+  public final net.corda.testing.driver.DriverParameters copy(boolean, java.nio.file.Path, net.corda.testing.driver.PortAllocation, net.corda.testing.driver.PortAllocation, java.util.Map<String, String>, boolean, boolean, boolean, java.util.List<net.corda.testing.node.NotarySpec>, java.util.List<String>, net.corda.testing.driver.JmxPolicy, net.corda.core.node.NetworkParameters)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.driver.PortAllocation getDebugPortAllocation()
-  @org.jetbrains.annotations.NotNull public final java.nio.file.Path getDriverDirectory()
-  @org.jetbrains.annotations.NotNull public final List getExtraCordappPackagesToScan()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.driver.JmxPolicy getJmxPolicy()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.NetworkParameters getNetworkParameters()
-  @org.jetbrains.annotations.NotNull public final List getNotarySpecs()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.driver.PortAllocation getPortAllocation()
+  @NotNull
+  public final net.corda.testing.driver.PortAllocation getDebugPortAllocation()
+  @NotNull
+  public final java.nio.file.Path getDriverDirectory()
+  @NotNull
+  public final java.util.List<String> getExtraCordappPackagesToScan()
+  @NotNull
+  public final net.corda.testing.driver.JmxPolicy getJmxPolicy()
+  @NotNull
+  public final net.corda.core.node.NetworkParameters getNetworkParameters()
+  @NotNull
+  public final java.util.List<net.corda.testing.node.NotarySpec> getNotarySpecs()
+  @NotNull
+  public final net.corda.testing.driver.PortAllocation getPortAllocation()
   public final boolean getStartNodesInProcess()
-  @org.jetbrains.annotations.NotNull public final Map getSystemProperties()
+  @NotNull
+  public final java.util.Map<String, String> getSystemProperties()
   public final boolean getUseTestClock()
   public final boolean getWaitForAllNodesToFinish()
   public int hashCode()
   public final boolean isDebug()
   public String toString()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.driver.DriverParameters withDebugPortAllocation(net.corda.testing.driver.PortAllocation)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.driver.DriverParameters withDriverDirectory(java.nio.file.Path)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.driver.DriverParameters withExtraCordappPackagesToScan(List)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.driver.DriverParameters withIsDebug(boolean)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.driver.DriverParameters withJmxPolicy(net.corda.testing.driver.JmxPolicy)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.driver.DriverParameters withNetworkParameters(net.corda.core.node.NetworkParameters)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.driver.DriverParameters withNotarySpecs(List)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.driver.DriverParameters withPortAllocation(net.corda.testing.driver.PortAllocation)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.driver.DriverParameters withStartNodesInProcess(boolean)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.driver.DriverParameters withSystemProperties(Map)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.driver.DriverParameters withUseTestClock(boolean)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.driver.DriverParameters withWaitForAllNodesToFinish(boolean)
+  @NotNull
+  public final net.corda.testing.driver.DriverParameters withDebugPortAllocation(net.corda.testing.driver.PortAllocation)
+  @NotNull
+  public final net.corda.testing.driver.DriverParameters withDriverDirectory(java.nio.file.Path)
+  @NotNull
+  public final net.corda.testing.driver.DriverParameters withExtraCordappPackagesToScan(java.util.List<String>)
+  @NotNull
+  public final net.corda.testing.driver.DriverParameters withIsDebug(boolean)
+  @NotNull
+  public final net.corda.testing.driver.DriverParameters withJmxPolicy(net.corda.testing.driver.JmxPolicy)
+  @NotNull
+  public final net.corda.testing.driver.DriverParameters withNetworkParameters(net.corda.core.node.NetworkParameters)
+  @NotNull
+  public final net.corda.testing.driver.DriverParameters withNotarySpecs(java.util.List<net.corda.testing.node.NotarySpec>)
+  @NotNull
+  public final net.corda.testing.driver.DriverParameters withPortAllocation(net.corda.testing.driver.PortAllocation)
+  @NotNull
+  public final net.corda.testing.driver.DriverParameters withStartNodesInProcess(boolean)
+  @NotNull
+  public final net.corda.testing.driver.DriverParameters withSystemProperties(java.util.Map<String, String>)
+  @NotNull
+  public final net.corda.testing.driver.DriverParameters withUseTestClock(boolean)
+  @NotNull
+  public final net.corda.testing.driver.DriverParameters withWaitForAllNodesToFinish(boolean)
 ##
-@net.corda.core.DoNotImplement public interface net.corda.testing.driver.InProcess extends net.corda.testing.driver.NodeHandle
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.node.ServiceHub getServices()
-  @org.jetbrains.annotations.NotNull public abstract rx.Observable registerInitiatedFlow(Class)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.concurrent.CordaFuture startFlow(net.corda.core.flows.FlowLogic)
+@DoNotImplement
+public interface net.corda.testing.driver.InProcess extends net.corda.testing.driver.NodeHandle
+  @NotNull
+  public abstract net.corda.core.node.ServiceHub getServices()
+  @NotNull
+  public abstract rx.Observable<T> registerInitiatedFlow(Class<T>)
+  @NotNull
+  public abstract net.corda.core.concurrent.CordaFuture<T> startFlow(net.corda.core.flows.FlowLogic<? extends T>)
 ##
 public final class net.corda.testing.driver.JmxPolicy extends java.lang.Object
   public <init>()
   public <init>(boolean, net.corda.testing.driver.PortAllocation)
   public final boolean component1()
-  @org.jetbrains.annotations.Nullable public final net.corda.testing.driver.PortAllocation component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.driver.JmxPolicy copy(boolean, net.corda.testing.driver.PortAllocation)
+  @Nullable
+  public final net.corda.testing.driver.PortAllocation component2()
+  @NotNull
+  public final net.corda.testing.driver.JmxPolicy copy(boolean, net.corda.testing.driver.PortAllocation)
   public boolean equals(Object)
-  @org.jetbrains.annotations.Nullable public final net.corda.testing.driver.PortAllocation getJmxHttpServerPortAllocation()
+  @Nullable
+  public final net.corda.testing.driver.PortAllocation getJmxHttpServerPortAllocation()
   public final boolean getStartJmxHttpServer()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.DoNotImplement public interface net.corda.testing.driver.NodeHandle extends java.lang.AutoCloseable
-  @org.jetbrains.annotations.NotNull public abstract java.nio.file.Path getBaseDirectory()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.node.NodeInfo getNodeInfo()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.utilities.NetworkHostAndPort getP2pAddress()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.messaging.CordaRPCOps getRpc()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.utilities.NetworkHostAndPort getRpcAddress()
-  @org.jetbrains.annotations.NotNull public abstract List getRpcUsers()
+@DoNotImplement
+public interface net.corda.testing.driver.NodeHandle extends java.lang.AutoCloseable
+  @NotNull
+  public abstract java.nio.file.Path getBaseDirectory()
+  @NotNull
+  public abstract net.corda.core.node.NodeInfo getNodeInfo()
+  @NotNull
+  public abstract net.corda.core.utilities.NetworkHostAndPort getP2pAddress()
+  @NotNull
+  public abstract net.corda.core.messaging.CordaRPCOps getRpc()
+  @NotNull
+  public abstract net.corda.core.utilities.NetworkHostAndPort getRpcAddress()
+  @NotNull
+  public abstract java.util.List<net.corda.testing.node.User> getRpcUsers()
   public abstract void stop()
 ##
 public final class net.corda.testing.driver.NodeParameters extends java.lang.Object
   public <init>()
-  public <init>(net.corda.core.identity.CordaX500Name, List, net.corda.testing.driver.VerifierType, Map, Boolean, String)
-  @org.jetbrains.annotations.Nullable public final net.corda.core.identity.CordaX500Name component1()
-  @org.jetbrains.annotations.NotNull public final List component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.driver.VerifierType component3()
-  @org.jetbrains.annotations.NotNull public final Map component4()
-  @org.jetbrains.annotations.Nullable public final Boolean component5()
-  @org.jetbrains.annotations.NotNull public final String component6()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.driver.NodeParameters copy(net.corda.core.identity.CordaX500Name, List, net.corda.testing.driver.VerifierType, Map, Boolean, String)
+  public <init>(net.corda.core.identity.CordaX500Name, java.util.List<net.corda.testing.node.User>, net.corda.testing.driver.VerifierType, java.util.Map<String, ?>, Boolean, String)
+  @Nullable
+  public final net.corda.core.identity.CordaX500Name component1()
+  @NotNull
+  public final java.util.List<net.corda.testing.node.User> component2()
+  @NotNull
+  public final net.corda.testing.driver.VerifierType component3()
+  @NotNull
+  public final java.util.Map<String, Object> component4()
+  @Nullable
+  public final Boolean component5()
+  @NotNull
+  public final String component6()
+  @NotNull
+  public final net.corda.testing.driver.NodeParameters copy(net.corda.core.identity.CordaX500Name, java.util.List<net.corda.testing.node.User>, net.corda.testing.driver.VerifierType, java.util.Map<String, ?>, Boolean, String)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final Map getCustomOverrides()
-  @org.jetbrains.annotations.NotNull public final String getMaximumHeapSize()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.identity.CordaX500Name getProvidedName()
-  @org.jetbrains.annotations.NotNull public final List getRpcUsers()
-  @org.jetbrains.annotations.Nullable public final Boolean getStartInSameProcess()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.driver.VerifierType getVerifierType()
+  @NotNull
+  public final java.util.Map<String, Object> getCustomOverrides()
+  @NotNull
+  public final String getMaximumHeapSize()
+  @Nullable
+  public final net.corda.core.identity.CordaX500Name getProvidedName()
+  @NotNull
+  public final java.util.List<net.corda.testing.node.User> getRpcUsers()
+  @Nullable
+  public final Boolean getStartInSameProcess()
+  @NotNull
+  public final net.corda.testing.driver.VerifierType getVerifierType()
   public int hashCode()
   public String toString()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.driver.NodeParameters withCustomOverrides(Map)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.driver.NodeParameters withMaximumHeapSize(String)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.driver.NodeParameters withProvidedName(net.corda.core.identity.CordaX500Name)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.driver.NodeParameters withRpcUsers(List)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.driver.NodeParameters withStartInSameProcess(Boolean)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.driver.NodeParameters withVerifierType(net.corda.testing.driver.VerifierType)
+  @NotNull
+  public final net.corda.testing.driver.NodeParameters withCustomOverrides(java.util.Map<String, ?>)
+  @NotNull
+  public final net.corda.testing.driver.NodeParameters withMaximumHeapSize(String)
+  @NotNull
+  public final net.corda.testing.driver.NodeParameters withProvidedName(net.corda.core.identity.CordaX500Name)
+  @NotNull
+  public final net.corda.testing.driver.NodeParameters withRpcUsers(java.util.List<net.corda.testing.node.User>)
+  @NotNull
+  public final net.corda.testing.driver.NodeParameters withStartInSameProcess(Boolean)
+  @NotNull
+  public final net.corda.testing.driver.NodeParameters withVerifierType(net.corda.testing.driver.VerifierType)
 ##
 public final class net.corda.testing.driver.NotaryHandle extends java.lang.Object
-  public <init>(net.corda.core.identity.Party, boolean, net.corda.core.concurrent.CordaFuture)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.Party component1()
+  public <init>(net.corda.core.identity.Party, boolean, net.corda.core.concurrent.CordaFuture<java.util.List<net.corda.testing.driver.NodeHandle>>)
+  @NotNull
+  public final net.corda.core.identity.Party component1()
   public final boolean component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.concurrent.CordaFuture component3()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.driver.NotaryHandle copy(net.corda.core.identity.Party, boolean, net.corda.core.concurrent.CordaFuture)
+  @NotNull
+  public final net.corda.core.concurrent.CordaFuture<java.util.List<net.corda.testing.driver.NodeHandle>> component3()
+  @NotNull
+  public final net.corda.testing.driver.NotaryHandle copy(net.corda.core.identity.Party, boolean, net.corda.core.concurrent.CordaFuture<java.util.List<net.corda.testing.driver.NodeHandle>>)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.Party getIdentity()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.concurrent.CordaFuture getNodeHandles()
+  @NotNull
+  public final net.corda.core.identity.Party getIdentity()
+  @NotNull
+  public final net.corda.core.concurrent.CordaFuture<java.util.List<net.corda.testing.driver.NodeHandle>> getNodeHandles()
   public final boolean getValidating()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.DoNotImplement public interface net.corda.testing.driver.OutOfProcess extends net.corda.testing.driver.NodeHandle
-  @org.jetbrains.annotations.NotNull public abstract Process getProcess()
+@DoNotImplement
+public interface net.corda.testing.driver.OutOfProcess extends net.corda.testing.driver.NodeHandle
+  @NotNull
+  public abstract Process getProcess()
 ##
-@net.corda.core.DoNotImplement public abstract class net.corda.testing.driver.PortAllocation extends java.lang.Object
+@DoNotImplement
+public abstract class net.corda.testing.driver.PortAllocation extends java.lang.Object
   public <init>()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.NetworkHostAndPort nextHostAndPort()
+  @NotNull
+  public final net.corda.core.utilities.NetworkHostAndPort nextHostAndPort()
   public abstract int nextPort()
 ##
-@net.corda.core.DoNotImplement public static final class net.corda.testing.driver.PortAllocation$Incremental extends net.corda.testing.driver.PortAllocation
+@DoNotImplement
+public static final class net.corda.testing.driver.PortAllocation$Incremental extends net.corda.testing.driver.PortAllocation
   public <init>(int)
-  @org.jetbrains.annotations.NotNull public final concurrent.atomic.AtomicInteger getPortCounter()
+  @NotNull
+  public final java.util.concurrent.atomic.AtomicInteger getPortCounter()
   public int nextPort()
 ##
 public final class net.corda.testing.driver.VerifierType extends java.lang.Enum
-  protected <init>(String, int)
+  protected <init>()
   public static net.corda.testing.driver.VerifierType valueOf(String)
   public static net.corda.testing.driver.VerifierType[] values()
 ##
 public final class net.corda.testing.driver.WebserverHandle extends java.lang.Object
   public <init>(net.corda.core.utilities.NetworkHostAndPort, Process)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.NetworkHostAndPort component1()
-  @org.jetbrains.annotations.NotNull public final Process component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.driver.WebserverHandle copy(net.corda.core.utilities.NetworkHostAndPort, Process)
+  @NotNull
+  public final net.corda.core.utilities.NetworkHostAndPort component1()
+  @NotNull
+  public final Process component2()
+  @NotNull
+  public final net.corda.testing.driver.WebserverHandle copy(net.corda.core.utilities.NetworkHostAndPort, Process)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.NetworkHostAndPort getListenAddress()
-  @org.jetbrains.annotations.NotNull public final Process getProcess()
+  @NotNull
+  public final net.corda.core.utilities.NetworkHostAndPort getListenAddress()
+  @NotNull
+  public final Process getProcess()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.DoNotImplement public abstract class net.corda.testing.node.ClusterSpec extends java.lang.Object
+@DoNotImplement
+public abstract class net.corda.testing.node.ClusterSpec extends java.lang.Object
   public <init>()
   public abstract int getClusterSize()
 ##
-@net.corda.core.DoNotImplement public static final class net.corda.testing.node.ClusterSpec$Raft extends net.corda.testing.node.ClusterSpec
+@DoNotImplement
+public static final class net.corda.testing.node.ClusterSpec$Raft extends net.corda.testing.node.ClusterSpec
   public <init>(int)
   public final int component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.ClusterSpec$Raft copy(int)
+  @NotNull
+  public final net.corda.testing.node.ClusterSpec$Raft copy(int)
   public boolean equals(Object)
   public int getClusterSize()
   public int hashCode()
   public String toString()
 ##
-@javax.annotation.concurrent.ThreadSafe public final class net.corda.testing.node.InMemoryMessagingNetwork extends net.corda.core.serialization.SingletonSerializeAsToken
-  @org.jetbrains.annotations.NotNull public synchronized final List getEndpointsExternal()
-  @org.jetbrains.annotations.NotNull public final rx.Observable getReceivedMessages()
-  @org.jetbrains.annotations.NotNull public final rx.Observable getSentMessages()
-  @org.jetbrains.annotations.Nullable public final net.corda.testing.node.InMemoryMessagingNetwork$MessageTransfer pumpSend(boolean)
+@ThreadSafe
+public final class net.corda.testing.node.InMemoryMessagingNetwork extends net.corda.core.serialization.SingletonSerializeAsToken
+  @NotNull
+  public final synchronized java.util.List<net.corda.testing.node.InMemoryMessagingNetwork$MockMessagingService> getEndpointsExternal()
+  @NotNull
+  public final rx.Observable<net.corda.testing.node.InMemoryMessagingNetwork$MessageTransfer> getReceivedMessages()
+  @NotNull
+  public final rx.Observable<net.corda.testing.node.InMemoryMessagingNetwork$MessageTransfer> getSentMessages()
+  @Nullable
+  public final net.corda.testing.node.InMemoryMessagingNetwork$MessageTransfer pumpSend(boolean)
   public final void stop()
   public static final net.corda.testing.node.InMemoryMessagingNetwork$Companion Companion
 ##
 public static final class net.corda.testing.node.InMemoryMessagingNetwork$Companion extends java.lang.Object
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.testing.node.InMemoryMessagingNetwork$DistributedServiceHandle extends java.lang.Object implements net.corda.core.messaging.MessageRecipientGroup
+@CordaSerializable
+public static final class net.corda.testing.node.InMemoryMessagingNetwork$DistributedServiceHandle extends java.lang.Object implements net.corda.core.messaging.MessageRecipientGroup
   public <init>(net.corda.core.identity.Party)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.Party component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.InMemoryMessagingNetwork$DistributedServiceHandle copy(net.corda.core.identity.Party)
+  @NotNull
+  public final net.corda.core.identity.Party component1()
+  @NotNull
+  public final net.corda.testing.node.InMemoryMessagingNetwork$DistributedServiceHandle copy(net.corda.core.identity.Party)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.Party getParty()
+  @NotNull
+  public final net.corda.core.identity.Party getParty()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public String toString()
+  @NotNull
+  public String toString()
 ##
 public static interface net.corda.testing.node.InMemoryMessagingNetwork$LatencyCalculator
-  @org.jetbrains.annotations.NotNull public abstract java.time.Duration between(net.corda.core.messaging.SingleMessageRecipient, net.corda.core.messaging.SingleMessageRecipient)
+  @NotNull
+  public abstract java.time.Duration between(net.corda.core.messaging.SingleMessageRecipient, net.corda.core.messaging.SingleMessageRecipient)
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.testing.node.InMemoryMessagingNetwork$MessageTransfer extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.utilities.ByteSequence getMessageData()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.messaging.MessageRecipients getRecipients()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.InMemoryMessagingNetwork$PeerHandle getSender()
-  @org.jetbrains.annotations.NotNull public String toString()
+@CordaSerializable
+public static final class net.corda.testing.node.InMemoryMessagingNetwork$MessageTransfer extends java.lang.Object
+  @NotNull
+  public final net.corda.core.utilities.ByteSequence getMessageData()
+  @NotNull
+  public final net.corda.core.messaging.MessageRecipients getRecipients()
+  @NotNull
+  public final net.corda.testing.node.InMemoryMessagingNetwork$PeerHandle getSender()
+  @NotNull
+  public String toString()
   public static final net.corda.testing.node.InMemoryMessagingNetwork$MessageTransfer$Companion Companion
 ##
 public static final class net.corda.testing.node.InMemoryMessagingNetwork$MessageTransfer$Companion extends java.lang.Object
 ##
 public static final class net.corda.testing.node.InMemoryMessagingNetwork$MockMessagingService extends java.lang.Object
-  @org.jetbrains.annotations.Nullable public final net.corda.testing.node.InMemoryMessagingNetwork$MessageTransfer pumpReceive(boolean)
+  @Nullable
+  public final net.corda.testing.node.InMemoryMessagingNetwork$MessageTransfer pumpReceive(boolean)
   public static final net.corda.testing.node.InMemoryMessagingNetwork$MockMessagingService$Companion Companion
 ##
 public static final class net.corda.testing.node.InMemoryMessagingNetwork$MockMessagingService$Companion extends java.lang.Object
 ##
-@net.corda.core.serialization.CordaSerializable public static final class net.corda.testing.node.InMemoryMessagingNetwork$PeerHandle extends java.lang.Object implements net.corda.core.messaging.SingleMessageRecipient
+@CordaSerializable
+public static final class net.corda.testing.node.InMemoryMessagingNetwork$PeerHandle extends java.lang.Object implements net.corda.core.messaging.SingleMessageRecipient
   public <init>(int, net.corda.core.identity.CordaX500Name)
   public final int component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.CordaX500Name component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.InMemoryMessagingNetwork$PeerHandle copy(int, net.corda.core.identity.CordaX500Name)
+  @NotNull
+  public final net.corda.core.identity.CordaX500Name component2()
+  @NotNull
+  public final net.corda.testing.node.InMemoryMessagingNetwork$PeerHandle copy(int, net.corda.core.identity.CordaX500Name)
   public boolean equals(Object)
   public final int getId()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.CordaX500Name getName()
+  @NotNull
+  public final net.corda.core.identity.CordaX500Name getName()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public String toString()
+  @NotNull
+  public String toString()
 ##
-@net.corda.core.DoNotImplement public abstract static class net.corda.testing.node.InMemoryMessagingNetwork$ServicePeerAllocationStrategy extends java.lang.Object
-  public abstract Object pickNext(net.corda.testing.node.InMemoryMessagingNetwork$DistributedServiceHandle, List)
+@DoNotImplement
+public abstract static class net.corda.testing.node.InMemoryMessagingNetwork$ServicePeerAllocationStrategy extends java.lang.Object
+  public abstract A pickNext(net.corda.testing.node.InMemoryMessagingNetwork$DistributedServiceHandle, java.util.List<? extends A>)
 ##
-@net.corda.core.DoNotImplement public static final class net.corda.testing.node.InMemoryMessagingNetwork$ServicePeerAllocationStrategy$Random extends net.corda.testing.node.InMemoryMessagingNetwork$ServicePeerAllocationStrategy
+@DoNotImplement
+public static final class net.corda.testing.node.InMemoryMessagingNetwork$ServicePeerAllocationStrategy$Random extends net.corda.testing.node.InMemoryMessagingNetwork$ServicePeerAllocationStrategy
   public <init>()
-  public <init>(SplittableRandom)
-  @org.jetbrains.annotations.NotNull public final SplittableRandom getRandom()
-  public Object pickNext(net.corda.testing.node.InMemoryMessagingNetwork$DistributedServiceHandle, List)
+  public <init>(java.util.SplittableRandom)
+  @NotNull
+  public final java.util.SplittableRandom getRandom()
+  public A pickNext(net.corda.testing.node.InMemoryMessagingNetwork$DistributedServiceHandle, java.util.List<? extends A>)
 ##
-@net.corda.core.DoNotImplement public static final class net.corda.testing.node.InMemoryMessagingNetwork$ServicePeerAllocationStrategy$RoundRobin extends net.corda.testing.node.InMemoryMessagingNetwork$ServicePeerAllocationStrategy
+@DoNotImplement
+public static final class net.corda.testing.node.InMemoryMessagingNetwork$ServicePeerAllocationStrategy$RoundRobin extends net.corda.testing.node.InMemoryMessagingNetwork$ServicePeerAllocationStrategy
   public <init>()
-  public Object pickNext(net.corda.testing.node.InMemoryMessagingNetwork$DistributedServiceHandle, List)
+  public A pickNext(net.corda.testing.node.InMemoryMessagingNetwork$DistributedServiceHandle, java.util.List<? extends A>)
 ##
 public class net.corda.testing.node.MockNetwork extends java.lang.Object
-  public <init>(List)
-  public <init>(List, net.corda.testing.node.MockNetworkParameters)
-  public <init>(List, net.corda.testing.node.MockNetworkParameters, boolean, boolean, net.corda.testing.node.InMemoryMessagingNetwork$ServicePeerAllocationStrategy, List, net.corda.core.node.NetworkParameters)
-  @org.jetbrains.annotations.NotNull public final java.nio.file.Path baseDirectory(int)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.StartedMockNode createNode()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.StartedMockNode createNode(net.corda.core.identity.CordaX500Name)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.StartedMockNode createNode(net.corda.core.identity.CordaX500Name, Integer)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.StartedMockNode createNode(net.corda.core.identity.CordaX500Name, Integer, java.math.BigInteger)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.StartedMockNode createNode(net.corda.core.identity.CordaX500Name, Integer, java.math.BigInteger, kotlin.jvm.functions.Function1)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.StartedMockNode createNode(net.corda.testing.node.MockNodeParameters)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.StartedMockNode createPartyNode(net.corda.core.identity.CordaX500Name)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.UnstartedMockNode createUnstartedNode()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.UnstartedMockNode createUnstartedNode(net.corda.core.identity.CordaX500Name)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.UnstartedMockNode createUnstartedNode(net.corda.core.identity.CordaX500Name, Integer)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.UnstartedMockNode createUnstartedNode(net.corda.core.identity.CordaX500Name, Integer, java.math.BigInteger)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.UnstartedMockNode createUnstartedNode(net.corda.core.identity.CordaX500Name, Integer, java.math.BigInteger, kotlin.jvm.functions.Function1)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.UnstartedMockNode createUnstartedNode(net.corda.testing.node.MockNodeParameters)
-  @org.jetbrains.annotations.NotNull public final List getCordappPackages()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.Party getDefaultNotaryIdentity()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.StartedMockNode getDefaultNotaryNode()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.MockNetworkParameters getDefaultParameters()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.NetworkParameters getNetworkParameters()
+  public <init>(java.util.List<String>)
+  public <init>(java.util.List<String>, net.corda.testing.node.MockNetworkParameters)
+  public <init>(java.util.List<String>, net.corda.testing.node.MockNetworkParameters, boolean, boolean, net.corda.testing.node.InMemoryMessagingNetwork$ServicePeerAllocationStrategy, java.util.List<net.corda.testing.node.MockNetworkNotarySpec>, net.corda.core.node.NetworkParameters)
+  @NotNull
+  public final java.nio.file.Path baseDirectory(int)
+  @NotNull
+  public final net.corda.testing.node.StartedMockNode createNode()
+  @NotNull
+  public final net.corda.testing.node.StartedMockNode createNode(net.corda.core.identity.CordaX500Name)
+  @NotNull
+  public final net.corda.testing.node.StartedMockNode createNode(net.corda.core.identity.CordaX500Name, Integer)
+  @NotNull
+  public final net.corda.testing.node.StartedMockNode createNode(net.corda.core.identity.CordaX500Name, Integer, java.math.BigInteger)
+  @NotNull
+  public final net.corda.testing.node.StartedMockNode createNode(net.corda.core.identity.CordaX500Name, Integer, java.math.BigInteger, kotlin.jvm.functions.Function1<? super net.corda.node.services.config.NodeConfiguration, ?>)
+  @NotNull
+  public final net.corda.testing.node.StartedMockNode createNode(net.corda.core.identity.CordaX500Name, Integer, java.math.BigInteger, kotlin.jvm.functions.Function1<? super net.corda.node.services.config.NodeConfiguration, ?>, java.util.List<String>)
+  @NotNull
+  public final net.corda.testing.node.StartedMockNode createNode(net.corda.testing.node.MockNodeParameters)
+  @NotNull
+  public final net.corda.testing.node.StartedMockNode createPartyNode(net.corda.core.identity.CordaX500Name)
+  @NotNull
+  public final net.corda.testing.node.UnstartedMockNode createUnstartedNode()
+  @NotNull
+  public final net.corda.testing.node.UnstartedMockNode createUnstartedNode(net.corda.core.identity.CordaX500Name)
+  @NotNull
+  public final net.corda.testing.node.UnstartedMockNode createUnstartedNode(net.corda.core.identity.CordaX500Name, Integer)
+  @NotNull
+  public final net.corda.testing.node.UnstartedMockNode createUnstartedNode(net.corda.core.identity.CordaX500Name, Integer, java.math.BigInteger)
+  @NotNull
+  public final net.corda.testing.node.UnstartedMockNode createUnstartedNode(net.corda.core.identity.CordaX500Name, Integer, java.math.BigInteger, kotlin.jvm.functions.Function1<? super net.corda.node.services.config.NodeConfiguration, ?>)
+  @NotNull
+  public final net.corda.testing.node.UnstartedMockNode createUnstartedNode(net.corda.core.identity.CordaX500Name, Integer, java.math.BigInteger, kotlin.jvm.functions.Function1<? super net.corda.node.services.config.NodeConfiguration, ?>, java.util.List<String>)
+  @NotNull
+  public final net.corda.testing.node.UnstartedMockNode createUnstartedNode(net.corda.testing.node.MockNodeParameters)
+  @NotNull
+  public final java.util.List<String> getCordappPackages()
+  @NotNull
+  public final net.corda.core.identity.Party getDefaultNotaryIdentity()
+  @NotNull
+  public final net.corda.testing.node.StartedMockNode getDefaultNotaryNode()
+  @NotNull
+  public final net.corda.testing.node.MockNetworkParameters getDefaultParameters()
+  @NotNull
+  public final net.corda.core.node.NetworkParameters getNetworkParameters()
   public final boolean getNetworkSendManuallyPumped()
   public final int getNextNodeId()
-  @org.jetbrains.annotations.NotNull public final List getNotaryNodes()
-  @org.jetbrains.annotations.NotNull public final List getNotarySpecs()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.InMemoryMessagingNetwork$ServicePeerAllocationStrategy getServicePeerAllocationStrategy()
+  @NotNull
+  public final java.util.List<net.corda.testing.node.StartedMockNode> getNotaryNodes()
+  @NotNull
+  public final java.util.List<net.corda.testing.node.MockNetworkNotarySpec> getNotarySpecs()
+  @NotNull
+  public final net.corda.testing.node.InMemoryMessagingNetwork$ServicePeerAllocationStrategy getServicePeerAllocationStrategy()
   public final boolean getThreadPerNode()
   public final void runNetwork()
   public final void runNetwork(int)
@@ -4055,272 +6236,334 @@ public class net.corda.testing.node.MockNetwork extends java.lang.Object
 public final class net.corda.testing.node.MockNetworkNotarySpec extends java.lang.Object
   public <init>(net.corda.core.identity.CordaX500Name)
   public <init>(net.corda.core.identity.CordaX500Name, boolean)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.CordaX500Name component1()
+  @NotNull
+  public final net.corda.core.identity.CordaX500Name component1()
   public final boolean component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.MockNetworkNotarySpec copy(net.corda.core.identity.CordaX500Name, boolean)
+  @NotNull
+  public final net.corda.testing.node.MockNetworkNotarySpec copy(net.corda.core.identity.CordaX500Name, boolean)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.CordaX500Name getName()
+  @NotNull
+  public final net.corda.core.identity.CordaX500Name getName()
   public final boolean getValidating()
   public int hashCode()
   public String toString()
 ##
 public final class net.corda.testing.node.MockNetworkParameters extends java.lang.Object
   public <init>()
-  public <init>(boolean, boolean, net.corda.testing.node.InMemoryMessagingNetwork$ServicePeerAllocationStrategy, List, net.corda.core.node.NetworkParameters)
+  public <init>(boolean, boolean, net.corda.testing.node.InMemoryMessagingNetwork$ServicePeerAllocationStrategy, java.util.List<net.corda.testing.node.MockNetworkNotarySpec>, net.corda.core.node.NetworkParameters)
   public final boolean component1()
   public final boolean component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.InMemoryMessagingNetwork$ServicePeerAllocationStrategy component3()
-  @org.jetbrains.annotations.NotNull public final List component4()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.NetworkParameters component5()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.MockNetworkParameters copy(boolean, boolean, net.corda.testing.node.InMemoryMessagingNetwork$ServicePeerAllocationStrategy, List, net.corda.core.node.NetworkParameters)
+  @NotNull
+  public final net.corda.testing.node.InMemoryMessagingNetwork$ServicePeerAllocationStrategy component3()
+  @NotNull
+  public final java.util.List<net.corda.testing.node.MockNetworkNotarySpec> component4()
+  @NotNull
+  public final net.corda.core.node.NetworkParameters component5()
+  @NotNull
+  public final net.corda.testing.node.MockNetworkParameters copy(boolean, boolean, net.corda.testing.node.InMemoryMessagingNetwork$ServicePeerAllocationStrategy, java.util.List<net.corda.testing.node.MockNetworkNotarySpec>, net.corda.core.node.NetworkParameters)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.NetworkParameters getNetworkParameters()
+  @NotNull
+  public final net.corda.core.node.NetworkParameters getNetworkParameters()
   public final boolean getNetworkSendManuallyPumped()
-  @org.jetbrains.annotations.NotNull public final List getNotarySpecs()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.InMemoryMessagingNetwork$ServicePeerAllocationStrategy getServicePeerAllocationStrategy()
+  @NotNull
+  public final java.util.List<net.corda.testing.node.MockNetworkNotarySpec> getNotarySpecs()
+  @NotNull
+  public final net.corda.testing.node.InMemoryMessagingNetwork$ServicePeerAllocationStrategy getServicePeerAllocationStrategy()
   public final boolean getThreadPerNode()
   public int hashCode()
   public String toString()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.MockNetworkParameters withNetworkParameters(net.corda.core.node.NetworkParameters)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.MockNetworkParameters withNetworkSendManuallyPumped(boolean)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.MockNetworkParameters withNotarySpecs(List)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.MockNetworkParameters withServicePeerAllocationStrategy(net.corda.testing.node.InMemoryMessagingNetwork$ServicePeerAllocationStrategy)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.MockNetworkParameters withThreadPerNode(boolean)
+  @NotNull
+  public final net.corda.testing.node.MockNetworkParameters withNetworkParameters(net.corda.core.node.NetworkParameters)
+  @NotNull
+  public final net.corda.testing.node.MockNetworkParameters withNetworkSendManuallyPumped(boolean)
+  @NotNull
+  public final net.corda.testing.node.MockNetworkParameters withNotarySpecs(java.util.List<net.corda.testing.node.MockNetworkNotarySpec>)
+  @NotNull
+  public final net.corda.testing.node.MockNetworkParameters withServicePeerAllocationStrategy(net.corda.testing.node.InMemoryMessagingNetwork$ServicePeerAllocationStrategy)
+  @NotNull
+  public final net.corda.testing.node.MockNetworkParameters withThreadPerNode(boolean)
 ##
 public final class net.corda.testing.node.MockNodeParameters extends java.lang.Object
   public <init>()
-  public <init>(Integer, net.corda.core.identity.CordaX500Name, java.math.BigInteger, kotlin.jvm.functions.Function1)
-  @org.jetbrains.annotations.Nullable public final Integer component1()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.identity.CordaX500Name component2()
-  @org.jetbrains.annotations.NotNull public final java.math.BigInteger component3()
-  @org.jetbrains.annotations.NotNull public final kotlin.jvm.functions.Function1 component4()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.MockNodeParameters copy(Integer, net.corda.core.identity.CordaX500Name, java.math.BigInteger, kotlin.jvm.functions.Function1)
+  public <init>(Integer, net.corda.core.identity.CordaX500Name, java.math.BigInteger, kotlin.jvm.functions.Function1<? super net.corda.node.services.config.NodeConfiguration, ?>)
+  public <init>(Integer, net.corda.core.identity.CordaX500Name, java.math.BigInteger, kotlin.jvm.functions.Function1<? super net.corda.node.services.config.NodeConfiguration, ?>, java.util.List<String>)
+  @Nullable
+  public final Integer component1()
+  @Nullable
+  public final net.corda.core.identity.CordaX500Name component2()
+  @NotNull
+  public final java.math.BigInteger component3()
+  @NotNull
+  public final kotlin.jvm.functions.Function1<net.corda.node.services.config.NodeConfiguration, Object> component4()
+  @NotNull
+  public final net.corda.testing.node.MockNodeParameters copy(Integer, net.corda.core.identity.CordaX500Name, java.math.BigInteger, kotlin.jvm.functions.Function1<? super net.corda.node.services.config.NodeConfiguration, ?>)
+  @NotNull
+  public final net.corda.testing.node.MockNodeParameters copy(Integer, net.corda.core.identity.CordaX500Name, java.math.BigInteger, kotlin.jvm.functions.Function1<? super net.corda.node.services.config.NodeConfiguration, ?>, java.util.List<String>)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final kotlin.jvm.functions.Function1 getConfigOverrides()
-  @org.jetbrains.annotations.NotNull public final java.math.BigInteger getEntropyRoot()
-  @org.jetbrains.annotations.Nullable public final Integer getForcedID()
-  @org.jetbrains.annotations.Nullable public final net.corda.core.identity.CordaX500Name getLegalName()
+  @NotNull
+  public final kotlin.jvm.functions.Function1<net.corda.node.services.config.NodeConfiguration, Object> getConfigOverrides()
+  @NotNull
+  public final java.math.BigInteger getEntropyRoot()
+  @Nullable
+  public final Integer getForcedID()
+  @Nullable
+  public final net.corda.core.identity.CordaX500Name getLegalName()
   public int hashCode()
   public String toString()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.MockNodeParameters withConfigOverrides(kotlin.jvm.functions.Function1)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.MockNodeParameters withEntropyRoot(java.math.BigInteger)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.MockNodeParameters withForcedID(Integer)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.MockNodeParameters withLegalName(net.corda.core.identity.CordaX500Name)
+  @NotNull
+  public final net.corda.testing.node.MockNodeParameters withConfigOverrides(kotlin.jvm.functions.Function1<? super net.corda.node.services.config.NodeConfiguration, ?>)
+  @NotNull
+  public final net.corda.testing.node.MockNodeParameters withEntropyRoot(java.math.BigInteger)
+  @NotNull
+  public final net.corda.testing.node.MockNodeParameters withForcedID(Integer)
+  @NotNull
+  public final net.corda.testing.node.MockNodeParameters withLegalName(net.corda.core.identity.CordaX500Name)
 ##
 public class net.corda.testing.node.MockServices extends java.lang.Object implements net.corda.core.node.ServiceHub
   public <init>()
-  public <init>(List)
-  public <init>(List, net.corda.core.identity.CordaX500Name)
-  public <init>(List, net.corda.core.identity.CordaX500Name, java.security.KeyPair, java.security.KeyPair...)
-  public <init>(List, net.corda.core.identity.CordaX500Name, net.corda.core.node.services.IdentityService)
-  public <init>(List, net.corda.core.identity.CordaX500Name, net.corda.core.node.services.IdentityService, java.security.KeyPair, java.security.KeyPair...)
-  public <init>(List, net.corda.testing.core.TestIdentity, net.corda.core.node.services.IdentityService, net.corda.core.node.NetworkParameters, java.security.KeyPair...)
-  public <init>(List, net.corda.testing.core.TestIdentity, net.corda.core.node.services.IdentityService, java.security.KeyPair...)
-  public <init>(List, net.corda.testing.core.TestIdentity, java.security.KeyPair...)
+  public <init>(java.util.List<String>)
+  public <init>(java.util.List<String>, net.corda.core.identity.CordaX500Name)
+  public <init>(java.util.List<String>, net.corda.core.identity.CordaX500Name, java.security.KeyPair, java.security.KeyPair...)
+  public <init>(java.util.List<String>, net.corda.core.identity.CordaX500Name, net.corda.core.node.services.IdentityService)
+  public <init>(java.util.List<String>, net.corda.core.identity.CordaX500Name, net.corda.core.node.services.IdentityService, java.security.KeyPair, java.security.KeyPair...)
+  public <init>(java.util.List<String>, net.corda.testing.core.TestIdentity, net.corda.core.node.services.IdentityService, net.corda.core.node.NetworkParameters, java.security.KeyPair...)
+  public <init>(java.util.List<String>, net.corda.testing.core.TestIdentity, net.corda.core.node.services.IdentityService, java.security.KeyPair...)
+  public <init>(java.util.List<String>, net.corda.testing.core.TestIdentity, java.security.KeyPair...)
   public <init>(net.corda.core.identity.CordaX500Name)
   public <init>(net.corda.core.identity.CordaX500Name, java.security.KeyPair, java.security.KeyPair...)
   public <init>(net.corda.core.identity.CordaX500Name, net.corda.core.node.services.IdentityService)
   public <init>(net.corda.core.identity.CordaX500Name, net.corda.core.node.services.IdentityService, java.security.KeyPair, java.security.KeyPair...)
   public <init>(net.corda.testing.core.TestIdentity, net.corda.testing.core.TestIdentity...)
   public final void addMockCordapp(String)
-  @org.jetbrains.annotations.NotNull public net.corda.core.transactions.SignedTransaction addSignature(net.corda.core.transactions.SignedTransaction)
-  @org.jetbrains.annotations.NotNull public net.corda.core.transactions.SignedTransaction addSignature(net.corda.core.transactions.SignedTransaction, java.security.PublicKey)
-  @org.jetbrains.annotations.NotNull public net.corda.core.serialization.SerializeAsToken cordaService(Class)
-  @org.jetbrains.annotations.NotNull public net.corda.core.crypto.TransactionSignature createSignature(net.corda.core.transactions.FilteredTransaction)
-  @org.jetbrains.annotations.NotNull public net.corda.core.crypto.TransactionSignature createSignature(net.corda.core.transactions.FilteredTransaction, java.security.PublicKey)
-  @org.jetbrains.annotations.NotNull public net.corda.core.crypto.TransactionSignature createSignature(net.corda.core.transactions.SignedTransaction)
-  @org.jetbrains.annotations.NotNull public net.corda.core.crypto.TransactionSignature createSignature(net.corda.core.transactions.SignedTransaction, java.security.PublicKey)
-  @org.jetbrains.annotations.NotNull public net.corda.core.cordapp.CordappContext getAppContext()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.services.MockAttachmentStorage getAttachments()
-  @org.jetbrains.annotations.NotNull public java.time.Clock getClock()
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.services.ContractUpgradeService getContractUpgradeService()
-  @org.jetbrains.annotations.NotNull public net.corda.core.cordapp.CordappProvider getCordappProvider()
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.services.IdentityService getIdentityService()
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.services.KeyManagementService getKeyManagementService()
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.NodeInfo getMyInfo()
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.services.NetworkMapCache getNetworkMapCache()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.NetworkParameters getNetworkParameters()
-  @org.jetbrains.annotations.NotNull protected final net.corda.core.node.ServicesForResolution getServicesForResolution()
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.services.TransactionVerifierService getTransactionVerifierService()
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.services.TransactionStorage getValidatedTransactions()
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.services.VaultService getVaultService()
-  @org.jetbrains.annotations.NotNull public java.sql.Connection jdbcSession()
-  @org.jetbrains.annotations.NotNull public net.corda.core.contracts.TransactionState loadState(net.corda.core.contracts.StateRef)
-  @org.jetbrains.annotations.NotNull public Set loadStates(Set)
-  @org.jetbrains.annotations.NotNull public static final Properties makeTestDataSourceProperties(String)
-  @org.jetbrains.annotations.NotNull public static final kotlin.Pair makeTestDatabaseAndMockServices(List, net.corda.core.node.services.IdentityService, net.corda.testing.core.TestIdentity, net.corda.core.node.NetworkParameters, java.security.KeyPair...)
-  @org.jetbrains.annotations.NotNull public static final kotlin.Pair makeTestDatabaseAndMockServices(List, net.corda.core.node.services.IdentityService, net.corda.testing.core.TestIdentity, java.security.KeyPair...)
-  public void recordTransactions(Iterable)
-  public void recordTransactions(net.corda.core.node.StatesToRecord, Iterable)
+  @NotNull
+  public net.corda.core.transactions.SignedTransaction addSignature(net.corda.core.transactions.SignedTransaction)
+  @NotNull
+  public net.corda.core.transactions.SignedTransaction addSignature(net.corda.core.transactions.SignedTransaction, java.security.PublicKey)
+  @NotNull
+  public T cordaService(Class<T>)
+  @NotNull
+  public net.corda.core.crypto.TransactionSignature createSignature(net.corda.core.transactions.FilteredTransaction)
+  @NotNull
+  public net.corda.core.crypto.TransactionSignature createSignature(net.corda.core.transactions.FilteredTransaction, java.security.PublicKey)
+  @NotNull
+  public net.corda.core.crypto.TransactionSignature createSignature(net.corda.core.transactions.SignedTransaction)
+  @NotNull
+  public net.corda.core.crypto.TransactionSignature createSignature(net.corda.core.transactions.SignedTransaction, java.security.PublicKey)
+  @NotNull
+  public final net.corda.testing.services.MockAttachmentStorage getAttachments()
+  @NotNull
+  public java.time.Clock getClock()
+  @NotNull
+  public net.corda.core.node.services.ContractUpgradeService getContractUpgradeService()
+  @NotNull
+  public net.corda.core.cordapp.CordappProvider getCordappProvider()
+  @NotNull
+  public net.corda.core.node.services.IdentityService getIdentityService()
+  @NotNull
+  public net.corda.core.node.services.KeyManagementService getKeyManagementService()
+  @NotNull
+  public net.corda.core.node.NodeInfo getMyInfo()
+  @NotNull
+  public net.corda.core.node.services.NetworkMapCache getNetworkMapCache()
+  @NotNull
+  public final net.corda.core.node.NetworkParameters getNetworkParameters()
+  @NotNull
+  protected final net.corda.core.node.ServicesForResolution getServicesForResolution()
+  @NotNull
+  public net.corda.core.node.services.TransactionVerifierService getTransactionVerifierService()
+  @NotNull
+  public net.corda.core.node.services.TransactionStorage getValidatedTransactions()
+  @NotNull
+  public net.corda.core.node.services.VaultService getVaultService()
+  @NotNull
+  public java.sql.Connection jdbcSession()
+  @NotNull
+  public net.corda.core.contracts.TransactionState<?> loadState(net.corda.core.contracts.StateRef)
+  @NotNull
+  public java.util.Set<net.corda.core.contracts.StateAndRef<net.corda.core.contracts.ContractState>> loadStates(java.util.Set<net.corda.core.contracts.StateRef>)
+  @NotNull
+  public static final java.util.Properties makeTestDataSourceProperties(String)
+  @NotNull
+  public static final kotlin.Pair<net.corda.nodeapi.internal.persistence.CordaPersistence, net.corda.testing.node.MockServices> makeTestDatabaseAndMockServices(java.util.List<String>, net.corda.core.node.services.IdentityService, net.corda.testing.core.TestIdentity, net.corda.core.node.NetworkParameters, java.security.KeyPair...)
+  @NotNull
+  public static final kotlin.Pair<net.corda.nodeapi.internal.persistence.CordaPersistence, net.corda.testing.node.MockServices> makeTestDatabaseAndMockServices(java.util.List<String>, net.corda.core.node.services.IdentityService, net.corda.testing.core.TestIdentity, java.security.KeyPair...)
+  public void recordTransactions(Iterable<net.corda.core.transactions.SignedTransaction>)
+  public void recordTransactions(net.corda.core.node.StatesToRecord, Iterable<net.corda.core.transactions.SignedTransaction>)
   public void recordTransactions(net.corda.core.transactions.SignedTransaction, net.corda.core.transactions.SignedTransaction...)
-  public void recordTransactions(boolean, Iterable)
+  public void recordTransactions(boolean, Iterable<net.corda.core.transactions.SignedTransaction>)
   public void recordTransactions(boolean, net.corda.core.transactions.SignedTransaction, net.corda.core.transactions.SignedTransaction...)
-  @org.jetbrains.annotations.NotNull public Void registerUnloadHandler(kotlin.jvm.functions.Function0)
-  @org.jetbrains.annotations.NotNull public net.corda.core.transactions.SignedTransaction signInitialTransaction(net.corda.core.transactions.TransactionBuilder)
-  @org.jetbrains.annotations.NotNull public net.corda.core.transactions.SignedTransaction signInitialTransaction(net.corda.core.transactions.TransactionBuilder, Iterable)
-  @org.jetbrains.annotations.NotNull public net.corda.core.transactions.SignedTransaction signInitialTransaction(net.corda.core.transactions.TransactionBuilder, java.security.PublicKey)
-  @org.jetbrains.annotations.NotNull public net.corda.core.contracts.StateAndRef toStateAndRef(net.corda.core.contracts.StateRef)
+  @NotNull
+  public Void registerUnloadHandler(kotlin.jvm.functions.Function0<kotlin.Unit>)
+  @NotNull
+  public net.corda.core.transactions.SignedTransaction signInitialTransaction(net.corda.core.transactions.TransactionBuilder)
+  @NotNull
+  public net.corda.core.transactions.SignedTransaction signInitialTransaction(net.corda.core.transactions.TransactionBuilder, Iterable<? extends java.security.PublicKey>)
+  @NotNull
+  public net.corda.core.transactions.SignedTransaction signInitialTransaction(net.corda.core.transactions.TransactionBuilder, java.security.PublicKey)
+  @NotNull
+  public net.corda.core.contracts.StateAndRef<T> toStateAndRef(net.corda.core.contracts.StateRef)
   public static final net.corda.testing.node.MockServices$Companion Companion
 ##
 public static final class net.corda.testing.node.MockServices$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final Properties makeTestDataSourceProperties(String)
-  @org.jetbrains.annotations.NotNull public final kotlin.Pair makeTestDatabaseAndMockServices(List, net.corda.core.node.services.IdentityService, net.corda.testing.core.TestIdentity, net.corda.core.node.NetworkParameters, java.security.KeyPair...)
-  @org.jetbrains.annotations.NotNull public final kotlin.Pair makeTestDatabaseAndMockServices(List, net.corda.core.node.services.IdentityService, net.corda.testing.core.TestIdentity, java.security.KeyPair...)
-##
-public static final class net.corda.testing.node.MockServices$Companion$makeTestDatabaseAndMockServices$mockService$1$1 extends net.corda.testing.node.MockServices
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.services.VaultService getVaultService()
-  @org.jetbrains.annotations.NotNull public java.sql.Connection jdbcSession()
-  public void recordTransactions(net.corda.core.node.StatesToRecord, Iterable)
+  @NotNull
+  public final java.util.Properties makeTestDataSourceProperties(String)
+  @NotNull
+  public final kotlin.Pair<net.corda.nodeapi.internal.persistence.CordaPersistence, net.corda.testing.node.MockServices> makeTestDatabaseAndMockServices(java.util.List<String>, net.corda.core.node.services.IdentityService, net.corda.testing.core.TestIdentity, net.corda.core.node.NetworkParameters, java.security.KeyPair...)
+  @NotNull
+  public final kotlin.Pair<net.corda.nodeapi.internal.persistence.CordaPersistence, net.corda.testing.node.MockServices> makeTestDatabaseAndMockServices(java.util.List<String>, net.corda.core.node.services.IdentityService, net.corda.testing.core.TestIdentity, java.security.KeyPair...)
 ##
 public final class net.corda.testing.node.MockServicesKt extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.serialization.SerializeAsToken createMockCordaService(net.corda.testing.node.MockServices, kotlin.jvm.functions.Function1)
-  @org.jetbrains.annotations.NotNull public static final net.corda.node.services.identity.InMemoryIdentityService makeTestIdentityService(net.corda.core.identity.PartyAndCertificate...)
-##
-public static final class net.corda.testing.node.MockServicesKt$createMockCordaService$MockAppServiceHubImpl extends java.lang.Object implements net.corda.core.node.AppServiceHub, net.corda.core.node.ServiceHub
-  public <init>(net.corda.testing.node.MockServices, net.corda.testing.node.MockServices, kotlin.jvm.functions.Function1)
-  @org.jetbrains.annotations.NotNull public net.corda.core.transactions.SignedTransaction addSignature(net.corda.core.transactions.SignedTransaction)
-  @org.jetbrains.annotations.NotNull public net.corda.core.transactions.SignedTransaction addSignature(net.corda.core.transactions.SignedTransaction, java.security.PublicKey)
-  @org.jetbrains.annotations.NotNull public net.corda.core.serialization.SerializeAsToken cordaService(Class)
-  @org.jetbrains.annotations.NotNull public net.corda.core.crypto.TransactionSignature createSignature(net.corda.core.transactions.FilteredTransaction)
-  @org.jetbrains.annotations.NotNull public net.corda.core.crypto.TransactionSignature createSignature(net.corda.core.transactions.FilteredTransaction, java.security.PublicKey)
-  @org.jetbrains.annotations.NotNull public net.corda.core.crypto.TransactionSignature createSignature(net.corda.core.transactions.SignedTransaction)
-  @org.jetbrains.annotations.NotNull public net.corda.core.crypto.TransactionSignature createSignature(net.corda.core.transactions.SignedTransaction, java.security.PublicKey)
-  @org.jetbrains.annotations.NotNull public net.corda.core.cordapp.CordappContext getAppContext()
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.services.AttachmentStorage getAttachments()
-  @org.jetbrains.annotations.NotNull public java.time.Clock getClock()
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.services.ContractUpgradeService getContractUpgradeService()
-  @org.jetbrains.annotations.NotNull public net.corda.core.cordapp.CordappProvider getCordappProvider()
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.services.IdentityService getIdentityService()
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.services.KeyManagementService getKeyManagementService()
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.NodeInfo getMyInfo()
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.services.NetworkMapCache getNetworkMapCache()
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.NetworkParameters getNetworkParameters()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.MockServices getServiceHub()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.serialization.SerializeAsToken getServiceInstance()
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.services.TransactionVerifierService getTransactionVerifierService()
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.services.TransactionStorage getValidatedTransactions()
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.services.VaultService getVaultService()
-  @org.jetbrains.annotations.NotNull public java.sql.Connection jdbcSession()
-  @org.jetbrains.annotations.NotNull public net.corda.core.contracts.TransactionState loadState(net.corda.core.contracts.StateRef)
-  @org.jetbrains.annotations.NotNull public Set loadStates(Set)
-  public void recordTransactions(Iterable)
-  public void recordTransactions(net.corda.core.node.StatesToRecord, Iterable)
-  public void recordTransactions(net.corda.core.transactions.SignedTransaction, net.corda.core.transactions.SignedTransaction...)
-  public void recordTransactions(boolean, Iterable)
-  public void recordTransactions(boolean, net.corda.core.transactions.SignedTransaction, net.corda.core.transactions.SignedTransaction...)
-  public void registerUnloadHandler(kotlin.jvm.functions.Function0)
-  @org.jetbrains.annotations.NotNull public net.corda.core.transactions.SignedTransaction signInitialTransaction(net.corda.core.transactions.TransactionBuilder)
-  @org.jetbrains.annotations.NotNull public net.corda.core.transactions.SignedTransaction signInitialTransaction(net.corda.core.transactions.TransactionBuilder, Iterable)
-  @org.jetbrains.annotations.NotNull public net.corda.core.transactions.SignedTransaction signInitialTransaction(net.corda.core.transactions.TransactionBuilder, java.security.PublicKey)
-  @org.jetbrains.annotations.NotNull public net.corda.core.messaging.FlowHandle startFlow(net.corda.core.flows.FlowLogic)
-  @org.jetbrains.annotations.NotNull public net.corda.core.messaging.FlowProgressHandle startTrackedFlow(net.corda.core.flows.FlowLogic)
-  @org.jetbrains.annotations.NotNull public net.corda.core.contracts.StateAndRef toStateAndRef(net.corda.core.contracts.StateRef)
+  @NotNull
+  public static final T createMockCordaService(net.corda.testing.node.MockServices, kotlin.jvm.functions.Function1<? super net.corda.core.node.AppServiceHub, ? extends T>)
+  @NotNull
+  public static final net.corda.node.services.identity.InMemoryIdentityService makeTestIdentityService(net.corda.core.identity.PartyAndCertificate...)
 ##
 public final class net.corda.testing.node.NodeTestUtils extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public static final net.corda.testing.dsl.LedgerDSL ledger(net.corda.core.node.ServiceHub, kotlin.jvm.functions.Function1)
-  @org.jetbrains.annotations.NotNull public static final net.corda.testing.dsl.LedgerDSL ledger(net.corda.core.node.ServiceHub, net.corda.core.identity.Party, kotlin.jvm.functions.Function1)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.context.Actor testActor(net.corda.core.identity.CordaX500Name)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.context.InvocationContext testContext(net.corda.core.identity.CordaX500Name)
-  @org.jetbrains.annotations.NotNull public static final net.corda.testing.dsl.LedgerDSL transaction(net.corda.core.node.ServiceHub, kotlin.jvm.functions.Function1)
-  @org.jetbrains.annotations.NotNull public static final net.corda.testing.dsl.LedgerDSL transaction(net.corda.core.node.ServiceHub, net.corda.core.identity.Party, kotlin.jvm.functions.Function1)
+  @NotNull
+  public static final net.corda.testing.dsl.LedgerDSL<net.corda.testing.dsl.TestTransactionDSLInterpreter, net.corda.testing.dsl.TestLedgerDSLInterpreter> ledger(net.corda.core.node.ServiceHub, kotlin.jvm.functions.Function1<? super net.corda.testing.dsl.LedgerDSL<net.corda.testing.dsl.TestTransactionDSLInterpreter, net.corda.testing.dsl.TestLedgerDSLInterpreter>, kotlin.Unit>)
+  @NotNull
+  public static final net.corda.testing.dsl.LedgerDSL<net.corda.testing.dsl.TestTransactionDSLInterpreter, net.corda.testing.dsl.TestLedgerDSLInterpreter> ledger(net.corda.core.node.ServiceHub, net.corda.core.identity.Party, kotlin.jvm.functions.Function1<? super net.corda.testing.dsl.LedgerDSL<net.corda.testing.dsl.TestTransactionDSLInterpreter, net.corda.testing.dsl.TestLedgerDSLInterpreter>, kotlin.Unit>)
+  @NotNull
+  public static final net.corda.core.context.Actor testActor(net.corda.core.identity.CordaX500Name)
+  @NotNull
+  public static final net.corda.core.context.InvocationContext testContext(net.corda.core.identity.CordaX500Name)
+  @NotNull
+  public static final net.corda.testing.dsl.LedgerDSL<net.corda.testing.dsl.TestTransactionDSLInterpreter, net.corda.testing.dsl.TestLedgerDSLInterpreter> transaction(net.corda.core.node.ServiceHub, kotlin.jvm.functions.Function1<? super net.corda.testing.dsl.TransactionDSL<? extends net.corda.testing.dsl.TransactionDSLInterpreter>, ? extends net.corda.testing.dsl.EnforceVerifyOrFail>)
+  @NotNull
+  public static final net.corda.testing.dsl.LedgerDSL<net.corda.testing.dsl.TestTransactionDSLInterpreter, net.corda.testing.dsl.TestLedgerDSLInterpreter> transaction(net.corda.core.node.ServiceHub, net.corda.core.identity.Party, kotlin.jvm.functions.Function1<? super net.corda.testing.dsl.TransactionDSL<? extends net.corda.testing.dsl.TransactionDSLInterpreter>, ? extends net.corda.testing.dsl.EnforceVerifyOrFail>)
 ##
 public final class net.corda.testing.node.NotarySpec extends java.lang.Object
-  public <init>(net.corda.core.identity.CordaX500Name, boolean, List, net.corda.testing.driver.VerifierType, net.corda.testing.node.ClusterSpec)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.CordaX500Name component1()
+  public <init>(net.corda.core.identity.CordaX500Name, boolean, java.util.List<net.corda.testing.node.User>, net.corda.testing.driver.VerifierType, net.corda.testing.node.ClusterSpec)
+  @NotNull
+  public final net.corda.core.identity.CordaX500Name component1()
   public final boolean component2()
-  @org.jetbrains.annotations.NotNull public final List component3()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.driver.VerifierType component4()
-  @org.jetbrains.annotations.Nullable public final net.corda.testing.node.ClusterSpec component5()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.NotarySpec copy(net.corda.core.identity.CordaX500Name, boolean, List, net.corda.testing.driver.VerifierType, net.corda.testing.node.ClusterSpec)
+  @NotNull
+  public final java.util.List<net.corda.testing.node.User> component3()
+  @NotNull
+  public final net.corda.testing.driver.VerifierType component4()
+  @Nullable
+  public final net.corda.testing.node.ClusterSpec component5()
+  @NotNull
+  public final net.corda.testing.node.NotarySpec copy(net.corda.core.identity.CordaX500Name, boolean, java.util.List<net.corda.testing.node.User>, net.corda.testing.driver.VerifierType, net.corda.testing.node.ClusterSpec)
   public boolean equals(Object)
-  @org.jetbrains.annotations.Nullable public final net.corda.testing.node.ClusterSpec getCluster()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.CordaX500Name getName()
-  @org.jetbrains.annotations.NotNull public final List getRpcUsers()
+  @Nullable
+  public final net.corda.testing.node.ClusterSpec getCluster()
+  @NotNull
+  public final net.corda.core.identity.CordaX500Name getName()
+  @NotNull
+  public final java.util.List<net.corda.testing.node.User> getRpcUsers()
   public final boolean getValidating()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.driver.VerifierType getVerifierType()
+  @NotNull
+  public final net.corda.testing.driver.VerifierType getVerifierType()
   public int hashCode()
   public String toString()
 ##
 public final class net.corda.testing.node.StartedMockNode extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final List findStateMachines(Class)
+  @NotNull
+  public final java.util.List<kotlin.Pair<F, net.corda.core.concurrent.CordaFuture<?>>> findStateMachines(Class<F>)
   public final int getId()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.NodeInfo getInfo()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.ServiceHub getServices()
-  @org.jetbrains.annotations.Nullable public final net.corda.testing.node.InMemoryMessagingNetwork$MessageTransfer pumpReceive(boolean)
-  @org.jetbrains.annotations.NotNull public final rx.Observable registerInitiatedFlow(Class)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.concurrent.CordaFuture startFlow(net.corda.core.flows.FlowLogic)
+  @NotNull
+  public final net.corda.core.node.NodeInfo getInfo()
+  @NotNull
+  public final net.corda.core.node.ServiceHub getServices()
+  @Nullable
+  public final net.corda.testing.node.InMemoryMessagingNetwork$MessageTransfer pumpReceive(boolean)
+  @NotNull
+  public final rx.Observable<F> registerInitiatedFlow(Class<F>)
+  @NotNull
+  public final net.corda.core.concurrent.CordaFuture<T> startFlow(net.corda.core.flows.FlowLogic<? extends T>)
   public final void stop()
-  public final Object transaction(kotlin.jvm.functions.Function0)
+  public final T transaction(kotlin.jvm.functions.Function0<? extends T>)
   public static final net.corda.testing.node.StartedMockNode$Companion Companion
 ##
 public static final class net.corda.testing.node.StartedMockNode$Companion extends java.lang.Object
 ##
-@javax.annotation.concurrent.ThreadSafe public final class net.corda.testing.node.TestClock extends net.corda.node.MutableClock
+@ThreadSafe
+public final class net.corda.testing.node.TestClock extends net.corda.node.MutableClock
   public <init>(java.time.Clock)
-  public synchronized final void advanceBy(java.time.Duration)
-  public synchronized final void setTo(java.time.Instant)
+  public final synchronized void advanceBy(java.time.Duration)
+  public final synchronized void setTo(java.time.Instant)
 ##
 public final class net.corda.testing.node.UnstartedMockNode extends java.lang.Object
   public final int getId()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.StartedMockNode start()
+  @NotNull
+  public final net.corda.testing.node.StartedMockNode start()
   public static final net.corda.testing.node.UnstartedMockNode$Companion Companion
 ##
 public static final class net.corda.testing.node.UnstartedMockNode$Companion extends java.lang.Object
 ##
 public final class net.corda.testing.node.User extends java.lang.Object
-  public <init>(String, String, Set)
-  @org.jetbrains.annotations.NotNull public final String component1()
-  @org.jetbrains.annotations.NotNull public final String component2()
-  @org.jetbrains.annotations.NotNull public final Set component3()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.node.User copy(String, String, Set)
+  public <init>(String, String, java.util.Set<String>)
+  @NotNull
+  public final String component1()
+  @NotNull
+  public final String component2()
+  @NotNull
+  public final java.util.Set<String> component3()
+  @NotNull
+  public final net.corda.testing.node.User copy(String, String, java.util.Set<String>)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final String getPassword()
-  @org.jetbrains.annotations.NotNull public final Set getPermissions()
-  @org.jetbrains.annotations.NotNull public final String getUsername()
+  @NotNull
+  public final String getPassword()
+  @NotNull
+  public final java.util.Set<String> getPermissions()
+  @NotNull
+  public final String getUsername()
   public int hashCode()
   public String toString()
 ##
 public final class net.corda.client.rpc.CordaRPCClient extends java.lang.Object
   public <init>(net.corda.core.utilities.NetworkHostAndPort)
   public <init>(net.corda.core.utilities.NetworkHostAndPort, net.corda.client.rpc.CordaRPCClientConfiguration)
-  @org.jetbrains.annotations.NotNull public final net.corda.client.rpc.CordaRPCConnection start(String, String)
-  @org.jetbrains.annotations.NotNull public final net.corda.client.rpc.CordaRPCConnection start(String, String, net.corda.core.context.Trace, net.corda.core.context.Actor)
-  public final Object use(String, String, kotlin.jvm.functions.Function1)
+  @NotNull
+  public final net.corda.client.rpc.CordaRPCConnection start(String, String)
+  @NotNull
+  public final net.corda.client.rpc.CordaRPCConnection start(String, String, net.corda.core.context.Trace, net.corda.core.context.Actor)
+  public final A use(String, String, kotlin.jvm.functions.Function1<? super net.corda.client.rpc.CordaRPCConnection, ? extends A>)
   public static final net.corda.client.rpc.CordaRPCClient$Companion Companion
 ##
 public static final class net.corda.client.rpc.CordaRPCClient$Companion extends java.lang.Object
 ##
 public interface net.corda.client.rpc.CordaRPCClientConfiguration
   public abstract int getCacheConcurrencyLevel()
-  @org.jetbrains.annotations.NotNull public abstract java.time.Duration getConnectionMaxRetryInterval()
-  @org.jetbrains.annotations.NotNull public abstract java.time.Duration getConnectionRetryInterval()
+  @NotNull
+  public abstract java.time.Duration getConnectionMaxRetryInterval()
+  @NotNull
+  public abstract java.time.Duration getConnectionRetryInterval()
   public abstract double getConnectionRetryIntervalMultiplier()
-  @org.jetbrains.annotations.NotNull public abstract java.time.Duration getDeduplicationCacheExpiry()
+  @NotNull
+  public abstract java.time.Duration getDeduplicationCacheExpiry()
   public abstract int getMaxFileSize()
   public abstract int getMaxReconnectAttempts()
   public abstract int getMinimumServerProtocolVersion()
   public abstract int getObservationExecutorPoolSize()
-  @org.jetbrains.annotations.NotNull public abstract java.time.Duration getReapInterval()
+  @NotNull
+  public abstract java.time.Duration getReapInterval()
   public abstract boolean getTrackRpcCallSites()
   public static final net.corda.client.rpc.CordaRPCClientConfiguration$Companion Companion
 ##
 public static final class net.corda.client.rpc.CordaRPCClientConfiguration$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.client.rpc.CordaRPCClientConfiguration default()
+  @NotNull
+  public final net.corda.client.rpc.CordaRPCClientConfiguration default()
 ##
-@net.corda.core.DoNotImplement public final class net.corda.client.rpc.CordaRPCConnection extends java.lang.Object implements net.corda.client.rpc.RPCConnection
-  public <init>(net.corda.client.rpc.RPCConnection)
+@DoNotImplement
+public final class net.corda.client.rpc.CordaRPCConnection extends java.lang.Object implements net.corda.client.rpc.RPCConnection
+  public <init>(net.corda.client.rpc.RPCConnection<? extends net.corda.core.messaging.CordaRPCOps>)
   public void close()
   public void forceClose()
-  @org.jetbrains.annotations.NotNull public net.corda.core.messaging.CordaRPCOps getProxy()
+  @NotNull
+  public net.corda.core.messaging.CordaRPCOps getProxy()
   public int getServerProtocolVersion()
   public void notifyServerAndClose()
 ##
 public final class net.corda.client.rpc.PermissionException extends net.corda.core.CordaRuntimeException implements net.corda.nodeapi.exceptions.RpcSerializableError
   public <init>(String)
 ##
-@net.corda.core.DoNotImplement public interface net.corda.client.rpc.RPCConnection extends java.io.Closeable
+@DoNotImplement
+public interface net.corda.client.rpc.RPCConnection extends java.io.Closeable
   public abstract void forceClose()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.messaging.RPCOps getProxy()
+  @NotNull
+  public abstract I getProxy()
   public abstract int getServerProtocolVersion()
   public abstract void notifyServerAndClose()
 ##
@@ -4332,24 +6575,32 @@ public @interface net.corda.client.rpc.RPCSinceVersion
   public abstract int version()
 ##
 public final class net.corda.client.rpc.UtilsKt extends java.lang.Object
-  public static final void notUsed(rx.Observable)
+  public static final void notUsed(rx.Observable<T>)
 ##
 public final class net.corda.testing.contracts.DummyContract extends java.lang.Object implements net.corda.core.contracts.Contract
   public <init>()
   public <init>(Object)
-  @org.jetbrains.annotations.Nullable public final Object component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.contracts.DummyContract copy(Object)
+  @Nullable
+  public final Object component1()
+  @NotNull
+  public final net.corda.testing.contracts.DummyContract copy(Object)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.transactions.TransactionBuilder generateInitial(int, net.corda.core.identity.Party, net.corda.core.contracts.PartyAndReference, net.corda.core.contracts.PartyAndReference...)
-  @org.jetbrains.annotations.Nullable public final Object getBlank()
-  @org.jetbrains.annotations.NotNull public final String getPROGRAM_ID()
+  @NotNull
+  public static final net.corda.core.transactions.TransactionBuilder generateInitial(int, net.corda.core.identity.Party, net.corda.core.contracts.PartyAndReference, net.corda.core.contracts.PartyAndReference...)
+  @Nullable
+  public final Object getBlank()
+  @NotNull
+  public final String getPROGRAM_ID()
   public int hashCode()
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.transactions.TransactionBuilder move(List, net.corda.core.identity.AbstractParty)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.transactions.TransactionBuilder move(net.corda.core.contracts.StateAndRef, net.corda.core.identity.AbstractParty)
+  @NotNull
+  public static final net.corda.core.transactions.TransactionBuilder move(java.util.List<net.corda.core.contracts.StateAndRef<net.corda.testing.contracts.DummyContract$SingleOwnerState>>, net.corda.core.identity.AbstractParty)
+  @NotNull
+  public static final net.corda.core.transactions.TransactionBuilder move(net.corda.core.contracts.StateAndRef<net.corda.testing.contracts.DummyContract$SingleOwnerState>, net.corda.core.identity.AbstractParty)
   public String toString()
   public void verify(net.corda.core.transactions.LedgerTransaction)
   public static final net.corda.testing.contracts.DummyContract$Companion Companion
-  @org.jetbrains.annotations.NotNull public static final String PROGRAM_ID = "net.corda.testing.contracts.DummyContract"
+  @NotNull
+  public static final String PROGRAM_ID = "net.corda.testing.contracts.DummyContract"
 ##
 public static interface net.corda.testing.contracts.DummyContract$Commands extends net.corda.core.contracts.CommandData
 ##
@@ -4360,46 +6611,65 @@ public static final class net.corda.testing.contracts.DummyContract$Commands$Mov
   public <init>()
 ##
 public static final class net.corda.testing.contracts.DummyContract$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.TransactionBuilder generateInitial(int, net.corda.core.identity.Party, net.corda.core.contracts.PartyAndReference, net.corda.core.contracts.PartyAndReference...)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.TransactionBuilder move(List, net.corda.core.identity.AbstractParty)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.TransactionBuilder move(net.corda.core.contracts.StateAndRef, net.corda.core.identity.AbstractParty)
+  @NotNull
+  public final net.corda.core.transactions.TransactionBuilder generateInitial(int, net.corda.core.identity.Party, net.corda.core.contracts.PartyAndReference, net.corda.core.contracts.PartyAndReference...)
+  @NotNull
+  public final net.corda.core.transactions.TransactionBuilder move(java.util.List<net.corda.core.contracts.StateAndRef<net.corda.testing.contracts.DummyContract$SingleOwnerState>>, net.corda.core.identity.AbstractParty)
+  @NotNull
+  public final net.corda.core.transactions.TransactionBuilder move(net.corda.core.contracts.StateAndRef<net.corda.testing.contracts.DummyContract$SingleOwnerState>, net.corda.core.identity.AbstractParty)
 ##
-@net.corda.core.DoNotImplement public static final class net.corda.testing.contracts.DummyContract$MultiOwnerState extends java.lang.Object implements net.corda.testing.contracts.DummyContract$State
-  public <init>(int, List)
+@DoNotImplement
+public static final class net.corda.testing.contracts.DummyContract$MultiOwnerState extends java.lang.Object implements net.corda.testing.contracts.DummyContract$State
+  public <init>(int, java.util.List<? extends net.corda.core.identity.AbstractParty>)
   public final int component1()
-  @org.jetbrains.annotations.NotNull public final List component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.contracts.DummyContract$MultiOwnerState copy(int, List)
+  @NotNull
+  public final java.util.List<net.corda.core.identity.AbstractParty> component2()
+  @NotNull
+  public final net.corda.testing.contracts.DummyContract$MultiOwnerState copy(int, java.util.List<? extends net.corda.core.identity.AbstractParty>)
   public boolean equals(Object)
   public int getMagicNumber()
-  @org.jetbrains.annotations.NotNull public final List getOwners()
-  @org.jetbrains.annotations.NotNull public List getParticipants()
+  @NotNull
+  public final java.util.List<net.corda.core.identity.AbstractParty> getOwners()
+  @NotNull
+  public java.util.List<net.corda.core.identity.AbstractParty> getParticipants()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.DoNotImplement public static final class net.corda.testing.contracts.DummyContract$SingleOwnerState extends java.lang.Object implements net.corda.testing.contracts.DummyContract$State, net.corda.core.contracts.OwnableState
+@DoNotImplement
+public static final class net.corda.testing.contracts.DummyContract$SingleOwnerState extends java.lang.Object implements net.corda.testing.contracts.DummyContract$State, net.corda.core.contracts.OwnableState
   public <init>(int, net.corda.core.identity.AbstractParty)
   public final int component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.AbstractParty component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.contracts.DummyContract$SingleOwnerState copy(int, net.corda.core.identity.AbstractParty)
+  @NotNull
+  public final net.corda.core.identity.AbstractParty component2()
+  @NotNull
+  public final net.corda.testing.contracts.DummyContract$SingleOwnerState copy(int, net.corda.core.identity.AbstractParty)
   public boolean equals(Object)
   public int getMagicNumber()
-  @org.jetbrains.annotations.NotNull public net.corda.core.identity.AbstractParty getOwner()
-  @org.jetbrains.annotations.NotNull public List getParticipants()
+  @NotNull
+  public net.corda.core.identity.AbstractParty getOwner()
+  @NotNull
+  public java.util.List<net.corda.core.identity.AbstractParty> getParticipants()
   public int hashCode()
   public String toString()
-  @org.jetbrains.annotations.NotNull public net.corda.core.contracts.CommandAndState withNewOwner(net.corda.core.identity.AbstractParty)
+  @NotNull
+  public net.corda.core.contracts.CommandAndState withNewOwner(net.corda.core.identity.AbstractParty)
 ##
-@net.corda.core.DoNotImplement public static interface net.corda.testing.contracts.DummyContract$State extends net.corda.core.contracts.ContractState
+@DoNotImplement
+public static interface net.corda.testing.contracts.DummyContract$State extends net.corda.core.contracts.ContractState
   public abstract int getMagicNumber()
 ##
 public final class net.corda.testing.contracts.DummyContractV2 extends java.lang.Object implements net.corda.core.contracts.UpgradedContractWithLegacyConstraint
   public <init>()
-  @org.jetbrains.annotations.NotNull public String getLegacyContract()
-  @org.jetbrains.annotations.NotNull public net.corda.core.contracts.AttachmentConstraint getLegacyContractConstraint()
-  @org.jetbrains.annotations.NotNull public net.corda.testing.contracts.DummyContractV2$State upgrade(net.corda.testing.contracts.DummyContract$State)
+  @NotNull
+  public String getLegacyContract()
+  @NotNull
+  public net.corda.core.contracts.AttachmentConstraint getLegacyContractConstraint()
+  @NotNull
+  public net.corda.testing.contracts.DummyContractV2$State upgrade(net.corda.testing.contracts.DummyContract$State)
   public void verify(net.corda.core.transactions.LedgerTransaction)
   public static final net.corda.testing.contracts.DummyContractV2$Companion Companion
-  @org.jetbrains.annotations.NotNull public static final String PROGRAM_ID = "net.corda.testing.contracts.DummyContractV2"
+  @NotNull
+  public static final String PROGRAM_ID = "net.corda.testing.contracts.DummyContractV2"
 ##
 public static interface net.corda.testing.contracts.DummyContractV2$Commands extends net.corda.core.contracts.CommandData
 ##
@@ -4412,14 +6682,18 @@ public static final class net.corda.testing.contracts.DummyContractV2$Commands$M
 public static final class net.corda.testing.contracts.DummyContractV2$Companion extends java.lang.Object
 ##
 public static final class net.corda.testing.contracts.DummyContractV2$State extends java.lang.Object implements net.corda.core.contracts.ContractState
-  public <init>(int, List)
+  public <init>(int, java.util.List<? extends net.corda.core.identity.AbstractParty>)
   public final int component1()
-  @org.jetbrains.annotations.NotNull public final List component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.contracts.DummyContractV2$State copy(int, List)
+  @NotNull
+  public final java.util.List<net.corda.core.identity.AbstractParty> component2()
+  @NotNull
+  public final net.corda.testing.contracts.DummyContractV2$State copy(int, java.util.List<? extends net.corda.core.identity.AbstractParty>)
   public boolean equals(Object)
   public final int getMagicNumber()
-  @org.jetbrains.annotations.NotNull public final List getOwners()
-  @org.jetbrains.annotations.NotNull public List getParticipants()
+  @NotNull
+  public final java.util.List<net.corda.core.identity.AbstractParty> getOwners()
+  @NotNull
+  public java.util.List<net.corda.core.identity.AbstractParty> getParticipants()
   public int hashCode()
   public String toString()
 ##
@@ -4427,10 +6701,12 @@ public final class net.corda.testing.contracts.DummyState extends java.lang.Obje
   public <init>()
   public <init>(int)
   public final int component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.contracts.DummyState copy(int)
+  @NotNull
+  public final net.corda.testing.contracts.DummyState copy(int)
   public boolean equals(Object)
   public final int getMagicNumber()
-  @org.jetbrains.annotations.NotNull public List getParticipants()
+  @NotNull
+  public java.util.List<net.corda.core.identity.AbstractParty> getParticipants()
   public int hashCode()
   public String toString()
 ##
@@ -4438,124 +6714,179 @@ public final class net.corda.testing.core.DummyCommandData extends net.corda.cor
   public static final net.corda.testing.core.DummyCommandData INSTANCE
 ##
 public final class net.corda.testing.core.Expect extends java.lang.Object
-  public <init>(Class, kotlin.jvm.functions.Function1, kotlin.jvm.functions.Function1)
-  @org.jetbrains.annotations.NotNull public final Class component1()
-  @org.jetbrains.annotations.NotNull public final kotlin.jvm.functions.Function1 component2()
-  @org.jetbrains.annotations.NotNull public final kotlin.jvm.functions.Function1 component3()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.core.Expect copy(Class, kotlin.jvm.functions.Function1, kotlin.jvm.functions.Function1)
+  public <init>(Class<T>, kotlin.jvm.functions.Function1<? super T, Boolean>, kotlin.jvm.functions.Function1<? super T, kotlin.Unit>)
+  @NotNull
+  public final Class<T> component1()
+  @NotNull
+  public final kotlin.jvm.functions.Function1<T, Boolean> component2()
+  @NotNull
+  public final kotlin.jvm.functions.Function1<T, kotlin.Unit> component3()
+  @NotNull
+  public final net.corda.testing.core.Expect<E, T> copy(Class<T>, kotlin.jvm.functions.Function1<? super T, Boolean>, kotlin.jvm.functions.Function1<? super T, kotlin.Unit>)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public final Class getClazz()
-  @org.jetbrains.annotations.NotNull public final kotlin.jvm.functions.Function1 getExpectClosure()
-  @org.jetbrains.annotations.NotNull public final kotlin.jvm.functions.Function1 getMatch()
+  @NotNull
+  public final Class<T> getClazz()
+  @NotNull
+  public final kotlin.jvm.functions.Function1<T, kotlin.Unit> getExpectClosure()
+  @NotNull
+  public final kotlin.jvm.functions.Function1<T, Boolean> getMatch()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.DoNotImplement public abstract class net.corda.testing.core.ExpectCompose extends java.lang.Object
+@DoNotImplement
+public abstract class net.corda.testing.core.ExpectCompose extends java.lang.Object
 ##
-@net.corda.core.DoNotImplement public static final class net.corda.testing.core.ExpectCompose$Parallel extends net.corda.testing.core.ExpectCompose
-  public <init>(List)
-  @org.jetbrains.annotations.NotNull public final List getParallel()
+@DoNotImplement
+public static final class net.corda.testing.core.ExpectCompose$Parallel extends net.corda.testing.core.ExpectCompose
+  public <init>(java.util.List<? extends net.corda.testing.core.ExpectCompose<? extends E>>)
+  @NotNull
+  public final java.util.List<net.corda.testing.core.ExpectCompose<E>> getParallel()
 ##
-@net.corda.core.DoNotImplement public static final class net.corda.testing.core.ExpectCompose$Sequential extends net.corda.testing.core.ExpectCompose
-  public <init>(List)
-  @org.jetbrains.annotations.NotNull public final List getSequence()
+@DoNotImplement
+public static final class net.corda.testing.core.ExpectCompose$Sequential extends net.corda.testing.core.ExpectCompose
+  public <init>(java.util.List<? extends net.corda.testing.core.ExpectCompose<? extends E>>)
+  @NotNull
+  public final java.util.List<net.corda.testing.core.ExpectCompose<E>> getSequence()
 ##
-@net.corda.core.DoNotImplement public static final class net.corda.testing.core.ExpectCompose$Single extends net.corda.testing.core.ExpectCompose
-  public <init>(net.corda.testing.core.Expect)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.core.Expect getExpect()
+@DoNotImplement
+public static final class net.corda.testing.core.ExpectCompose$Single extends net.corda.testing.core.ExpectCompose
+  public <init>(net.corda.testing.core.Expect<? extends E, T>)
+  @NotNull
+  public final net.corda.testing.core.Expect<E, T> getExpect()
 ##
 public static final class net.corda.testing.core.ExpectComposeState$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.core.ExpectComposeState fromExpectCompose(net.corda.testing.core.ExpectCompose)
+  @NotNull
+  public final net.corda.testing.core.ExpectComposeState<E> fromExpectCompose(net.corda.testing.core.ExpectCompose<? extends E>)
 ##
 public static final class net.corda.testing.core.ExpectComposeState$Finished extends net.corda.testing.core.ExpectComposeState
   public <init>()
-  @org.jetbrains.annotations.NotNull public List getExpectedEvents()
-  @org.jetbrains.annotations.Nullable public Void nextState(Object)
+  @NotNull
+  public java.util.List<Class<E>> getExpectedEvents()
+  @Nullable
+  public Void nextState(E)
 ##
 public static final class net.corda.testing.core.ExpectComposeState$Parallel extends net.corda.testing.core.ExpectComposeState
-  public <init>(net.corda.testing.core.ExpectCompose$Parallel, List)
-  @org.jetbrains.annotations.NotNull public List getExpectedEvents()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.core.ExpectCompose$Parallel getParallel()
-  @org.jetbrains.annotations.NotNull public final List getStates()
-  @org.jetbrains.annotations.Nullable public kotlin.Pair nextState(Object)
+  public <init>(net.corda.testing.core.ExpectCompose$Parallel<? extends E>, java.util.List<? extends net.corda.testing.core.ExpectComposeState<E>>)
+  @NotNull
+  public java.util.List<Class<? extends E>> getExpectedEvents()
+  @NotNull
+  public final net.corda.testing.core.ExpectCompose$Parallel<E> getParallel()
+  @NotNull
+  public final java.util.List<net.corda.testing.core.ExpectComposeState<E>> getStates()
+  @Nullable
+  public kotlin.Pair<kotlin.jvm.functions.Function0<kotlin.Unit>, net.corda.testing.core.ExpectComposeState<E>> nextState(E)
 ##
 public static final class net.corda.testing.core.ExpectComposeState$Sequential extends net.corda.testing.core.ExpectComposeState
-  public <init>(net.corda.testing.core.ExpectCompose$Sequential, int, net.corda.testing.core.ExpectComposeState)
-  @org.jetbrains.annotations.NotNull public List getExpectedEvents()
+  public <init>(net.corda.testing.core.ExpectCompose$Sequential<? extends E>, int, net.corda.testing.core.ExpectComposeState<E>)
+  @NotNull
+  public java.util.List<Class<? extends E>> getExpectedEvents()
   public final int getIndex()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.core.ExpectCompose$Sequential getSequential()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.core.ExpectComposeState getState()
-  @org.jetbrains.annotations.Nullable public kotlin.Pair nextState(Object)
+  @NotNull
+  public final net.corda.testing.core.ExpectCompose$Sequential<E> getSequential()
+  @NotNull
+  public final net.corda.testing.core.ExpectComposeState<E> getState()
+  @Nullable
+  public kotlin.Pair<kotlin.jvm.functions.Function0<kotlin.Unit>, net.corda.testing.core.ExpectComposeState<E>> nextState(E)
 ##
 public static final class net.corda.testing.core.ExpectComposeState$Single extends net.corda.testing.core.ExpectComposeState
-  public <init>(net.corda.testing.core.ExpectCompose$Single)
-  @org.jetbrains.annotations.NotNull public List getExpectedEvents()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.core.ExpectCompose$Single getSingle()
-  @org.jetbrains.annotations.Nullable public kotlin.Pair nextState(Object)
+  public <init>(net.corda.testing.core.ExpectCompose$Single<? extends E, T>)
+  @NotNull
+  public java.util.List<Class<T>> getExpectedEvents()
+  @NotNull
+  public final net.corda.testing.core.ExpectCompose$Single<E, T> getSingle()
+  @Nullable
+  public kotlin.Pair<kotlin.jvm.functions.Function0<kotlin.Unit>, net.corda.testing.core.ExpectComposeState<E>> nextState(E)
 ##
 public final class net.corda.testing.core.ExpectKt extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public static final net.corda.testing.core.ExpectCompose expect(Class, kotlin.jvm.functions.Function1, kotlin.jvm.functions.Function1)
-  public static final void expectEvents(Iterable, boolean, kotlin.jvm.functions.Function0)
-  public static final void expectEvents(rx.Observable, boolean, kotlin.jvm.functions.Function0)
-  public static final void genericExpectEvents(Object, boolean, kotlin.jvm.functions.Function2, kotlin.jvm.functions.Function0)
-  @org.jetbrains.annotations.NotNull public static final net.corda.testing.core.ExpectCompose parallel(List)
-  @org.jetbrains.annotations.NotNull public static final net.corda.testing.core.ExpectCompose parallel(net.corda.testing.core.ExpectCompose...)
-  @org.jetbrains.annotations.NotNull public static final net.corda.testing.core.ExpectCompose replicate(int, kotlin.jvm.functions.Function1)
-  @org.jetbrains.annotations.NotNull public static final net.corda.testing.core.ExpectCompose sequence(List)
-  @org.jetbrains.annotations.NotNull public static final net.corda.testing.core.ExpectCompose sequence(net.corda.testing.core.ExpectCompose...)
-##
-public static final class net.corda.testing.core.ExpectKt$expectEvents$1$lock$1 extends java.lang.Object
+  @NotNull
+  public static final net.corda.testing.core.ExpectCompose<E> expect(Class<E>, kotlin.jvm.functions.Function1<? super E, Boolean>, kotlin.jvm.functions.Function1<? super E, kotlin.Unit>)
+  public static final void expectEvents(Iterable<? extends E>, boolean, kotlin.jvm.functions.Function0<? extends net.corda.testing.core.ExpectCompose<? extends E>>)
+  public static final void expectEvents(rx.Observable<E>, boolean, kotlin.jvm.functions.Function0<? extends net.corda.testing.core.ExpectCompose<? extends E>>)
+  public static final void genericExpectEvents(S, boolean, kotlin.jvm.functions.Function2<? super S, ? super kotlin.jvm.functions.Function1<? super E, kotlin.Unit>, kotlin.Unit>, kotlin.jvm.functions.Function0<? extends net.corda.testing.core.ExpectCompose<? extends E>>)
+  @NotNull
+  public static final net.corda.testing.core.ExpectCompose<E> parallel(java.util.List<? extends net.corda.testing.core.ExpectCompose<? extends E>>)
+  @NotNull
+  public static final net.corda.testing.core.ExpectCompose<E> parallel(net.corda.testing.core.ExpectCompose<? extends E>...)
+  @NotNull
+  public static final net.corda.testing.core.ExpectCompose<E> replicate(int, kotlin.jvm.functions.Function1<? super Integer, ? extends net.corda.testing.core.ExpectCompose<? extends E>>)
+  @NotNull
+  public static final net.corda.testing.core.ExpectCompose<E> sequence(java.util.List<? extends net.corda.testing.core.ExpectCompose<? extends E>>)
+  @NotNull
+  public static final net.corda.testing.core.ExpectCompose<E> sequence(net.corda.testing.core.ExpectCompose<? extends E>...)
 ##
 public final class net.corda.testing.core.SerializationEnvironmentRule extends java.lang.Object implements org.junit.rules.TestRule
   public <init>()
   public <init>(boolean)
-  @org.jetbrains.annotations.NotNull public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement, org.junit.runner.Description)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.serialization.SerializationContext getCheckpointContext()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.serialization.SerializationFactory getSerializationFactory()
+  @NotNull
+  public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement, org.junit.runner.Description)
+  @NotNull
+  public final net.corda.core.serialization.SerializationContext getCheckpointContext()
+  @NotNull
+  public final net.corda.core.serialization.SerializationFactory getSerializationFactory()
   public static final net.corda.testing.core.SerializationEnvironmentRule$Companion Companion
 ##
 public static final class net.corda.testing.core.SerializationEnvironmentRule$Companion extends java.lang.Object
-  public final Object run(String, kotlin.jvm.functions.Function1)
-##
-public static final class net.corda.testing.core.SerializationEnvironmentRule$apply$1 extends org.junit.runners.model.Statement
-  public void evaluate()
+  public final T run(String, kotlin.jvm.functions.Function1<? super net.corda.core.serialization.internal.SerializationEnvironment, ? extends T>)
 ##
 public final class net.corda.testing.core.TestConstants extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.contracts.Command dummyCommand(java.security.PublicKey...)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.identity.CordaX500Name ALICE_NAME
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.identity.CordaX500Name BOB_NAME
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.identity.CordaX500Name BOC_NAME
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.identity.CordaX500Name CHARLIE_NAME
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.identity.CordaX500Name DUMMY_BANK_A_NAME
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.identity.CordaX500Name DUMMY_BANK_B_NAME
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.identity.CordaX500Name DUMMY_BANK_C_NAME
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.identity.CordaX500Name DUMMY_NOTARY_NAME
+  @NotNull
+  public static final net.corda.core.contracts.Command<net.corda.core.contracts.TypeOnlyCommandData> dummyCommand(java.security.PublicKey...)
+  @NotNull
+  public static final net.corda.core.identity.CordaX500Name ALICE_NAME
+  @NotNull
+  public static final net.corda.core.identity.CordaX500Name BOB_NAME
+  @NotNull
+  public static final net.corda.core.identity.CordaX500Name BOC_NAME
+  @NotNull
+  public static final net.corda.core.identity.CordaX500Name CHARLIE_NAME
+  @NotNull
+  public static final net.corda.core.identity.CordaX500Name DUMMY_BANK_A_NAME
+  @NotNull
+  public static final net.corda.core.identity.CordaX500Name DUMMY_BANK_B_NAME
+  @NotNull
+  public static final net.corda.core.identity.CordaX500Name DUMMY_BANK_C_NAME
+  @NotNull
+  public static final net.corda.core.identity.CordaX500Name DUMMY_NOTARY_NAME
   public static final int MAX_MESSAGE_SIZE = 10485760
 ##
 public final class net.corda.testing.core.TestIdentity extends java.lang.Object
   public <init>(net.corda.core.identity.CordaX500Name)
   public <init>(net.corda.core.identity.CordaX500Name, long)
   public <init>(net.corda.core.identity.CordaX500Name, java.security.KeyPair)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.PartyAndCertificate getIdentity()
-  @org.jetbrains.annotations.NotNull public final java.security.KeyPair getKeyPair()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.CordaX500Name getName()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.identity.Party getParty()
-  @org.jetbrains.annotations.NotNull public final java.security.PublicKey getPublicKey()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.PartyAndReference ref(byte...)
+  @NotNull
+  public final net.corda.core.identity.PartyAndCertificate getIdentity()
+  @NotNull
+  public final java.security.KeyPair getKeyPair()
+  @NotNull
+  public final net.corda.core.identity.CordaX500Name getName()
+  @NotNull
+  public final net.corda.core.identity.Party getParty()
+  @NotNull
+  public final java.security.PublicKey getPublicKey()
+  @NotNull
+  public final net.corda.core.contracts.PartyAndReference ref(byte...)
   public static final net.corda.testing.core.TestIdentity$Companion Companion
 ##
 public static final class net.corda.testing.core.TestIdentity$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.core.TestIdentity fresh(String)
+  @NotNull
+  public final net.corda.testing.core.TestIdentity fresh(String)
 ##
 public final class net.corda.testing.core.TestUtils extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.utilities.NetworkHostAndPort freeLocalHostAndPort()
+  @NotNull
+  public static final net.corda.core.utilities.NetworkHostAndPort freeLocalHostAndPort()
   public static final int freePort()
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.contracts.StateRef generateStateRef()
-  @org.jetbrains.annotations.NotNull public static final List getFreeLocalPorts(String, int)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.identity.PartyAndCertificate getTestPartyAndCertificate(net.corda.core.identity.CordaX500Name, java.security.PublicKey)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.identity.PartyAndCertificate getTestPartyAndCertificate(net.corda.core.identity.Party)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.identity.Party singleIdentity(net.corda.core.node.NodeInfo)
-  @org.jetbrains.annotations.NotNull public static final net.corda.core.identity.PartyAndCertificate singleIdentityAndCert(net.corda.core.node.NodeInfo)
+  @NotNull
+  public static final net.corda.core.contracts.StateRef generateStateRef()
+  @NotNull
+  public static final java.util.List<net.corda.core.utilities.NetworkHostAndPort> getFreeLocalPorts(String, int)
+  @NotNull
+  public static final net.corda.core.identity.PartyAndCertificate getTestPartyAndCertificate(net.corda.core.identity.CordaX500Name, java.security.PublicKey)
+  @NotNull
+  public static final net.corda.core.identity.PartyAndCertificate getTestPartyAndCertificate(net.corda.core.identity.Party)
+  @NotNull
+  public static final net.corda.core.identity.Party singleIdentity(net.corda.core.node.NodeInfo)
+  @NotNull
+  public static final net.corda.core.identity.PartyAndCertificate singleIdentityAndCert(net.corda.core.node.NodeInfo)
 ##
 public final class net.corda.testing.database.DatabaseConstants extends java.lang.Object
   @org.jetbrains.annotations.NotNull public static final String DATA_SOURCE_CLASSNAME = "dataSourceProperties.dataSourceClassName"
@@ -4580,136 +6911,196 @@ public final class net.corda.testing.dsl.AttachmentResolutionException extends n
   public <init>(net.corda.core.crypto.SecureHash)
 ##
 public final class net.corda.testing.dsl.DoubleSpentInputs extends net.corda.core.flows.FlowException
-  public <init>(List)
+  public <init>(java.util.List<? extends net.corda.core.crypto.SecureHash>)
 ##
 public final class net.corda.testing.dsl.DuplicateOutputLabel extends net.corda.core.flows.FlowException
   public <init>(String)
 ##
-@net.corda.core.DoNotImplement public abstract class net.corda.testing.dsl.EnforceVerifyOrFail extends java.lang.Object
+@DoNotImplement
+public abstract class net.corda.testing.dsl.EnforceVerifyOrFail extends java.lang.Object
 ##
-@net.corda.core.DoNotImplement public static final class net.corda.testing.dsl.EnforceVerifyOrFail$Token extends net.corda.testing.dsl.EnforceVerifyOrFail
+@DoNotImplement
+public static final class net.corda.testing.dsl.EnforceVerifyOrFail$Token extends net.corda.testing.dsl.EnforceVerifyOrFail
   public static final net.corda.testing.dsl.EnforceVerifyOrFail$Token INSTANCE
 ##
-@net.corda.core.DoNotImplement public final class net.corda.testing.dsl.LedgerDSL extends java.lang.Object implements net.corda.testing.dsl.LedgerDSLInterpreter
-  public <init>(net.corda.testing.dsl.LedgerDSLInterpreter, net.corda.core.identity.Party)
-  @org.jetbrains.annotations.NotNull public net.corda.core.transactions.WireTransaction _transaction(String, net.corda.core.transactions.TransactionBuilder, kotlin.jvm.functions.Function1)
-  public void _tweak(kotlin.jvm.functions.Function1)
-  @org.jetbrains.annotations.NotNull public net.corda.core.transactions.WireTransaction _unverifiedTransaction(String, net.corda.core.transactions.TransactionBuilder, kotlin.jvm.functions.Function1)
-  @org.jetbrains.annotations.NotNull public net.corda.core.crypto.SecureHash attachment(java.io.InputStream)
-  @org.jetbrains.annotations.NotNull public net.corda.testing.dsl.EnforceVerifyOrFail fails()
-  @org.jetbrains.annotations.NotNull public net.corda.testing.dsl.EnforceVerifyOrFail fails with(String)
-  @org.jetbrains.annotations.NotNull public net.corda.testing.dsl.EnforceVerifyOrFail failsWith(String)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.dsl.LedgerDSLInterpreter getInterpreter()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.contracts.ContractState retrieveOutput(Class, String)
-  @org.jetbrains.annotations.NotNull public net.corda.core.contracts.StateAndRef retrieveOutputStateAndRef(Class, String)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.WireTransaction transaction(String, kotlin.jvm.functions.Function1)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.WireTransaction transaction(String, net.corda.core.transactions.TransactionBuilder, kotlin.jvm.functions.Function1)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.WireTransaction transaction(kotlin.jvm.functions.Function1)
-  public final void tweak(kotlin.jvm.functions.Function1)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.WireTransaction unverifiedTransaction(String, kotlin.jvm.functions.Function1)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.WireTransaction unverifiedTransaction(String, net.corda.core.transactions.TransactionBuilder, kotlin.jvm.functions.Function1)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.WireTransaction unverifiedTransaction(kotlin.jvm.functions.Function1)
-  @org.jetbrains.annotations.NotNull public net.corda.testing.dsl.EnforceVerifyOrFail verifies()
+@DoNotImplement
+public final class net.corda.testing.dsl.LedgerDSL extends java.lang.Object implements net.corda.testing.dsl.LedgerDSLInterpreter
+  public <init>(L, net.corda.core.identity.Party)
+  @NotNull
+  public net.corda.core.transactions.WireTransaction _transaction(String, net.corda.core.transactions.TransactionBuilder, kotlin.jvm.functions.Function1<? super net.corda.testing.dsl.TransactionDSLInterpreter, ? extends net.corda.testing.dsl.EnforceVerifyOrFail>)
+  public void _tweak(kotlin.jvm.functions.Function1<? super net.corda.testing.dsl.LedgerDSLInterpreter<? extends net.corda.testing.dsl.TransactionDSLInterpreter>, kotlin.Unit>)
+  @NotNull
+  public net.corda.core.transactions.WireTransaction _unverifiedTransaction(String, net.corda.core.transactions.TransactionBuilder, kotlin.jvm.functions.Function1<? super net.corda.testing.dsl.TransactionDSLInterpreter, kotlin.Unit>)
+  @NotNull
+  public net.corda.core.crypto.SecureHash attachment(java.io.InputStream)
+  @NotNull
+  public net.corda.testing.dsl.EnforceVerifyOrFail fails()
+  @NotNull
+  public net.corda.testing.dsl.EnforceVerifyOrFail fails with(String)
+  @NotNull
+  public net.corda.testing.dsl.EnforceVerifyOrFail failsWith(String)
+  @NotNull
+  public final L getInterpreter()
+  @NotNull
+  public final S retrieveOutput(Class<S>, String)
+  @NotNull
+  public net.corda.core.contracts.StateAndRef<S> retrieveOutputStateAndRef(Class<S>, String)
+  @NotNull
+  public final net.corda.core.transactions.WireTransaction transaction(String, kotlin.jvm.functions.Function1<? super net.corda.testing.dsl.TransactionDSL<? extends net.corda.testing.dsl.TransactionDSLInterpreter>, ? extends net.corda.testing.dsl.EnforceVerifyOrFail>)
+  @NotNull
+  public final net.corda.core.transactions.WireTransaction transaction(String, net.corda.core.transactions.TransactionBuilder, kotlin.jvm.functions.Function1<? super net.corda.testing.dsl.TransactionDSL<? extends net.corda.testing.dsl.TransactionDSLInterpreter>, ? extends net.corda.testing.dsl.EnforceVerifyOrFail>)
+  @NotNull
+  public final net.corda.core.transactions.WireTransaction transaction(kotlin.jvm.functions.Function1<? super net.corda.testing.dsl.TransactionDSL<? extends net.corda.testing.dsl.TransactionDSLInterpreter>, ? extends net.corda.testing.dsl.EnforceVerifyOrFail>)
+  public final void tweak(kotlin.jvm.functions.Function1<? super net.corda.testing.dsl.LedgerDSL<? extends T, ? extends L>, kotlin.Unit>)
+  @NotNull
+  public final net.corda.core.transactions.WireTransaction unverifiedTransaction(String, kotlin.jvm.functions.Function1<? super net.corda.testing.dsl.TransactionDSL<? extends net.corda.testing.dsl.TransactionDSLInterpreter>, kotlin.Unit>)
+  @NotNull
+  public final net.corda.core.transactions.WireTransaction unverifiedTransaction(String, net.corda.core.transactions.TransactionBuilder, kotlin.jvm.functions.Function1<? super net.corda.testing.dsl.TransactionDSL<? extends net.corda.testing.dsl.TransactionDSLInterpreter>, kotlin.Unit>)
+  @NotNull
+  public final net.corda.core.transactions.WireTransaction unverifiedTransaction(kotlin.jvm.functions.Function1<? super net.corda.testing.dsl.TransactionDSL<? extends net.corda.testing.dsl.TransactionDSLInterpreter>, kotlin.Unit>)
+  @NotNull
+  public net.corda.testing.dsl.EnforceVerifyOrFail verifies()
 ##
-@net.corda.core.DoNotImplement public interface net.corda.testing.dsl.LedgerDSLInterpreter extends net.corda.testing.dsl.OutputStateLookup, net.corda.testing.dsl.Verifies
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.transactions.WireTransaction _transaction(String, net.corda.core.transactions.TransactionBuilder, kotlin.jvm.functions.Function1)
-  public abstract void _tweak(kotlin.jvm.functions.Function1)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.transactions.WireTransaction _unverifiedTransaction(String, net.corda.core.transactions.TransactionBuilder, kotlin.jvm.functions.Function1)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.crypto.SecureHash attachment(java.io.InputStream)
+@DoNotImplement
+public interface net.corda.testing.dsl.LedgerDSLInterpreter extends net.corda.testing.dsl.OutputStateLookup, net.corda.testing.dsl.Verifies
+  @NotNull
+  public abstract net.corda.core.transactions.WireTransaction _transaction(String, net.corda.core.transactions.TransactionBuilder, kotlin.jvm.functions.Function1<? super T, ? extends net.corda.testing.dsl.EnforceVerifyOrFail>)
+  public abstract void _tweak(kotlin.jvm.functions.Function1<? super net.corda.testing.dsl.LedgerDSLInterpreter<? extends T>, kotlin.Unit>)
+  @NotNull
+  public abstract net.corda.core.transactions.WireTransaction _unverifiedTransaction(String, net.corda.core.transactions.TransactionBuilder, kotlin.jvm.functions.Function1<? super T, kotlin.Unit>)
+  @NotNull
+  public abstract net.corda.core.crypto.SecureHash attachment(java.io.InputStream)
 ##
-@net.corda.core.DoNotImplement public interface net.corda.testing.dsl.OutputStateLookup
-  @org.jetbrains.annotations.NotNull public abstract net.corda.core.contracts.StateAndRef retrieveOutputStateAndRef(Class, String)
+@DoNotImplement
+public interface net.corda.testing.dsl.OutputStateLookup
+  @NotNull
+  public abstract net.corda.core.contracts.StateAndRef<S> retrieveOutputStateAndRef(Class<S>, String)
 ##
-@net.corda.core.DoNotImplement public final class net.corda.testing.dsl.TestLedgerDSLInterpreter extends java.lang.Object implements net.corda.testing.dsl.LedgerDSLInterpreter
+@DoNotImplement
+public final class net.corda.testing.dsl.TestLedgerDSLInterpreter extends java.lang.Object implements net.corda.testing.dsl.LedgerDSLInterpreter
   public <init>(net.corda.core.node.ServiceHub)
-  @org.jetbrains.annotations.NotNull public net.corda.core.transactions.WireTransaction _transaction(String, net.corda.core.transactions.TransactionBuilder, kotlin.jvm.functions.Function1)
-  public void _tweak(kotlin.jvm.functions.Function1)
-  @org.jetbrains.annotations.NotNull public net.corda.core.transactions.WireTransaction _unverifiedTransaction(String, net.corda.core.transactions.TransactionBuilder, kotlin.jvm.functions.Function1)
-  @org.jetbrains.annotations.NotNull public net.corda.core.crypto.SecureHash attachment(java.io.InputStream)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.ServiceHub component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.dsl.TestLedgerDSLInterpreter copy(net.corda.core.node.ServiceHub, HashMap, HashMap, HashMap)
+  @NotNull
+  public net.corda.core.transactions.WireTransaction _transaction(String, net.corda.core.transactions.TransactionBuilder, kotlin.jvm.functions.Function1<? super net.corda.testing.dsl.TestTransactionDSLInterpreter, ? extends net.corda.testing.dsl.EnforceVerifyOrFail>)
+  public void _tweak(kotlin.jvm.functions.Function1<? super net.corda.testing.dsl.LedgerDSLInterpreter<net.corda.testing.dsl.TestTransactionDSLInterpreter>, kotlin.Unit>)
+  @NotNull
+  public net.corda.core.transactions.WireTransaction _unverifiedTransaction(String, net.corda.core.transactions.TransactionBuilder, kotlin.jvm.functions.Function1<? super net.corda.testing.dsl.TestTransactionDSLInterpreter, kotlin.Unit>)
+  @NotNull
+  public net.corda.core.crypto.SecureHash attachment(java.io.InputStream)
+  @NotNull
+  public final net.corda.core.node.ServiceHub component1()
+  @NotNull
+  public final net.corda.testing.dsl.TestLedgerDSLInterpreter copy(net.corda.core.node.ServiceHub, java.util.HashMap<String, net.corda.core.contracts.StateAndRef<net.corda.core.contracts.ContractState>>, java.util.HashMap<net.corda.core.crypto.SecureHash, net.corda.testing.dsl.TestLedgerDSLInterpreter$WireTransactionWithLocation>, java.util.HashMap<net.corda.core.crypto.SecureHash, net.corda.testing.dsl.TestLedgerDSLInterpreter$WireTransactionWithLocation>)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public net.corda.testing.dsl.EnforceVerifyOrFail fails()
-  @org.jetbrains.annotations.NotNull public net.corda.testing.dsl.EnforceVerifyOrFail fails with(String)
-  @org.jetbrains.annotations.NotNull public net.corda.testing.dsl.EnforceVerifyOrFail failsWith(String)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.ServiceHub getServices()
-  @org.jetbrains.annotations.NotNull public final List getTransactionsToVerify()
-  @org.jetbrains.annotations.NotNull public final List getTransactionsUnverified()
-  @org.jetbrains.annotations.NotNull public final List getWireTransactions()
+  @NotNull
+  public net.corda.testing.dsl.EnforceVerifyOrFail fails()
+  @NotNull
+  public net.corda.testing.dsl.EnforceVerifyOrFail fails with(String)
+  @NotNull
+  public net.corda.testing.dsl.EnforceVerifyOrFail failsWith(String)
+  @NotNull
+  public final net.corda.core.node.ServiceHub getServices()
+  @NotNull
+  public final java.util.List<net.corda.core.transactions.WireTransaction> getTransactionsToVerify()
+  @NotNull
+  public final java.util.List<net.corda.core.transactions.WireTransaction> getTransactionsUnverified()
+  @NotNull
+  public final java.util.List<net.corda.core.transactions.WireTransaction> getWireTransactions()
   public int hashCode()
-  @org.jetbrains.annotations.Nullable public final String outputToLabel(net.corda.core.contracts.ContractState)
-  @org.jetbrains.annotations.NotNull public net.corda.core.contracts.StateAndRef retrieveOutputStateAndRef(Class, String)
+  @Nullable
+  public final String outputToLabel(net.corda.core.contracts.ContractState)
+  @NotNull
+  public net.corda.core.contracts.StateAndRef<S> retrieveOutputStateAndRef(Class<S>, String)
   public String toString()
-  @org.jetbrains.annotations.Nullable public final String transactionName(net.corda.core.crypto.SecureHash)
-  @org.jetbrains.annotations.NotNull public net.corda.testing.dsl.EnforceVerifyOrFail verifies()
+  @Nullable
+  public final String transactionName(net.corda.core.crypto.SecureHash)
+  @NotNull
+  public net.corda.testing.dsl.EnforceVerifyOrFail verifies()
   public static final net.corda.testing.dsl.TestLedgerDSLInterpreter$Companion Companion
 ##
 public static final class net.corda.testing.dsl.TestLedgerDSLInterpreter$Companion extends java.lang.Object
 ##
 public static final class net.corda.testing.dsl.TestLedgerDSLInterpreter$TypeMismatch extends java.lang.Exception
-  public <init>(Class, Class)
+  public <init>(Class<?>, Class<?>)
 ##
 public static final class net.corda.testing.dsl.TestLedgerDSLInterpreter$VerifiesFailed extends java.lang.Exception
   public <init>(String, Throwable)
 ##
 public static final class net.corda.testing.dsl.TestLedgerDSLInterpreter$WireTransactionWithLocation extends java.lang.Object
   public <init>(String, net.corda.core.transactions.WireTransaction, String)
-  @org.jetbrains.annotations.Nullable public final String component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.WireTransaction component2()
-  @org.jetbrains.annotations.Nullable public final String component3()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.dsl.TestLedgerDSLInterpreter$WireTransactionWithLocation copy(String, net.corda.core.transactions.WireTransaction, String)
+  @Nullable
+  public final String component1()
+  @NotNull
+  public final net.corda.core.transactions.WireTransaction component2()
+  @Nullable
+  public final String component3()
+  @NotNull
+  public final net.corda.testing.dsl.TestLedgerDSLInterpreter$WireTransactionWithLocation copy(String, net.corda.core.transactions.WireTransaction, String)
   public boolean equals(Object)
-  @org.jetbrains.annotations.Nullable public final String getLabel()
-  @org.jetbrains.annotations.Nullable public final String getLocation()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.WireTransaction getTransaction()
+  @Nullable
+  public final String getLabel()
+  @Nullable
+  public final String getLocation()
+  @NotNull
+  public final net.corda.core.transactions.WireTransaction getTransaction()
   public int hashCode()
   public String toString()
 ##
-@net.corda.core.DoNotImplement public final class net.corda.testing.dsl.TestTransactionDSLInterpreter extends java.lang.Object implements net.corda.testing.dsl.TransactionDSLInterpreter, net.corda.testing.dsl.OutputStateLookup
+@DoNotImplement
+public final class net.corda.testing.dsl.TestTransactionDSLInterpreter extends java.lang.Object implements net.corda.testing.dsl.TransactionDSLInterpreter, net.corda.testing.dsl.OutputStateLookup
   public <init>(net.corda.testing.dsl.TestLedgerDSLInterpreter, net.corda.core.transactions.TransactionBuilder)
   public void _attachment(String)
-  @org.jetbrains.annotations.NotNull public net.corda.testing.dsl.EnforceVerifyOrFail _tweak(kotlin.jvm.functions.Function1)
+  @NotNull
+  public net.corda.testing.dsl.EnforceVerifyOrFail _tweak(kotlin.jvm.functions.Function1<? super net.corda.testing.dsl.TransactionDSLInterpreter, ? extends net.corda.testing.dsl.EnforceVerifyOrFail>)
   public void attachment(net.corda.core.crypto.SecureHash)
-  public void command(List, net.corda.core.contracts.CommandData)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.dsl.TestLedgerDSLInterpreter component1()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.TransactionBuilder component2()
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.dsl.TestTransactionDSLInterpreter copy(net.corda.testing.dsl.TestLedgerDSLInterpreter, net.corda.core.transactions.TransactionBuilder, HashMap)
+  public void command(java.util.List<? extends java.security.PublicKey>, net.corda.core.contracts.CommandData)
+  @NotNull
+  public final net.corda.testing.dsl.TestLedgerDSLInterpreter component1()
+  @NotNull
+  public final net.corda.core.transactions.TransactionBuilder component2()
+  @NotNull
+  public final net.corda.testing.dsl.TestTransactionDSLInterpreter copy(net.corda.testing.dsl.TestLedgerDSLInterpreter, net.corda.core.transactions.TransactionBuilder, java.util.HashMap<String, Integer>)
   public boolean equals(Object)
-  @org.jetbrains.annotations.NotNull public net.corda.testing.dsl.EnforceVerifyOrFail fails()
-  @org.jetbrains.annotations.NotNull public net.corda.testing.dsl.EnforceVerifyOrFail fails with(String)
-  @org.jetbrains.annotations.NotNull public net.corda.testing.dsl.EnforceVerifyOrFail failsWith(String)
-  @org.jetbrains.annotations.NotNull public net.corda.testing.dsl.TestLedgerDSLInterpreter getLedgerInterpreter()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.node.ServicesForResolution getServices()
-  @org.jetbrains.annotations.NotNull public final net.corda.core.transactions.TransactionBuilder getTransactionBuilder()
+  @NotNull
+  public net.corda.testing.dsl.EnforceVerifyOrFail fails()
+  @NotNull
+  public net.corda.testing.dsl.EnforceVerifyOrFail fails with(String)
+  @NotNull
+  public net.corda.testing.dsl.EnforceVerifyOrFail failsWith(String)
+  @NotNull
+  public net.corda.testing.dsl.TestLedgerDSLInterpreter getLedgerInterpreter()
+  @NotNull
+  public final net.corda.core.node.ServicesForResolution getServices()
+  @NotNull
+  public final net.corda.core.transactions.TransactionBuilder getTransactionBuilder()
   public int hashCode()
   public void input(net.corda.core.contracts.StateRef)
   public void output(String, String, net.corda.core.identity.Party, Integer, net.corda.core.contracts.AttachmentConstraint, net.corda.core.contracts.ContractState)
-  @org.jetbrains.annotations.NotNull public net.corda.core.contracts.StateAndRef retrieveOutputStateAndRef(Class, String)
+  @NotNull
+  public net.corda.core.contracts.StateAndRef<S> retrieveOutputStateAndRef(Class<S>, String)
   public void timeWindow(net.corda.core.contracts.TimeWindow)
   public String toString()
-  @org.jetbrains.annotations.NotNull public net.corda.testing.dsl.EnforceVerifyOrFail verifies()
+  @NotNull
+  public net.corda.testing.dsl.EnforceVerifyOrFail verifies()
 ##
-public static final class net.corda.testing.dsl.TestTransactionDSLInterpreter$services$1 extends java.lang.Object implements net.corda.core.node.ServicesForResolution
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.services.AttachmentStorage getAttachments()
-  @org.jetbrains.annotations.NotNull public net.corda.core.cordapp.CordappProvider getCordappProvider()
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.services.IdentityService getIdentityService()
-  @org.jetbrains.annotations.NotNull public net.corda.core.node.NetworkParameters getNetworkParameters()
-  @org.jetbrains.annotations.NotNull public net.corda.core.contracts.TransactionState loadState(net.corda.core.contracts.StateRef)
-  @org.jetbrains.annotations.NotNull public Set loadStates(Set)
-##
-@net.corda.core.DoNotImplement public final class net.corda.testing.dsl.TransactionDSL extends java.lang.Object implements net.corda.testing.dsl.TransactionDSLInterpreter
-  public <init>(net.corda.testing.dsl.TransactionDSLInterpreter, net.corda.core.identity.Party)
+@DoNotImplement
+public final class net.corda.testing.dsl.TransactionDSL extends java.lang.Object implements net.corda.testing.dsl.TransactionDSLInterpreter
+  public <init>(T, net.corda.core.identity.Party)
   public void _attachment(String)
-  @org.jetbrains.annotations.NotNull public net.corda.testing.dsl.EnforceVerifyOrFail _tweak(kotlin.jvm.functions.Function1)
+  @NotNull
+  public net.corda.testing.dsl.EnforceVerifyOrFail _tweak(kotlin.jvm.functions.Function1<? super net.corda.testing.dsl.TransactionDSLInterpreter, ? extends net.corda.testing.dsl.EnforceVerifyOrFail>)
   public final void attachment(String)
   public void attachment(net.corda.core.crypto.SecureHash)
   public final void attachments(String...)
   public final void command(java.security.PublicKey, net.corda.core.contracts.CommandData)
-  public void command(List, net.corda.core.contracts.CommandData)
-  @org.jetbrains.annotations.NotNull public net.corda.testing.dsl.EnforceVerifyOrFail fails()
-  @org.jetbrains.annotations.NotNull public net.corda.testing.dsl.EnforceVerifyOrFail fails with(String)
-  @org.jetbrains.annotations.NotNull public net.corda.testing.dsl.EnforceVerifyOrFail failsWith(String)
-  @org.jetbrains.annotations.NotNull public net.corda.testing.dsl.LedgerDSLInterpreter getLedgerInterpreter()
+  public void command(java.util.List<? extends java.security.PublicKey>, net.corda.core.contracts.CommandData)
+  @NotNull
+  public net.corda.testing.dsl.EnforceVerifyOrFail fails()
+  @NotNull
+  public net.corda.testing.dsl.EnforceVerifyOrFail fails with(String)
+  @NotNull
+  public net.corda.testing.dsl.EnforceVerifyOrFail failsWith(String)
+  @NotNull
+  public net.corda.testing.dsl.LedgerDSLInterpreter<net.corda.testing.dsl.TransactionDSLInterpreter> getLedgerInterpreter()
   public final void input(String)
   public final void input(String, String)
   public final void input(String, net.corda.core.contracts.ContractState)
@@ -4721,43 +7112,58 @@ public static final class net.corda.testing.dsl.TestTransactionDSLInterpreter$se
   public final void output(String, String, net.corda.core.identity.Party, net.corda.core.contracts.ContractState)
   public final void output(String, net.corda.core.contracts.ContractState)
   public final void output(String, net.corda.core.identity.Party, net.corda.core.contracts.ContractState)
-  @org.jetbrains.annotations.NotNull public net.corda.core.contracts.StateAndRef retrieveOutputStateAndRef(Class, String)
+  @NotNull
+  public net.corda.core.contracts.StateAndRef<S> retrieveOutputStateAndRef(Class<S>, String)
   public final void timeWindow(java.time.Instant)
   public final void timeWindow(java.time.Instant, java.time.Duration)
   public void timeWindow(net.corda.core.contracts.TimeWindow)
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.dsl.EnforceVerifyOrFail tweak(kotlin.jvm.functions.Function1)
-  @org.jetbrains.annotations.NotNull public net.corda.testing.dsl.EnforceVerifyOrFail verifies()
+  @NotNull
+  public final net.corda.testing.dsl.EnforceVerifyOrFail tweak(kotlin.jvm.functions.Function1<? super net.corda.testing.dsl.TransactionDSL<? extends net.corda.testing.dsl.TransactionDSLInterpreter>, ? extends net.corda.testing.dsl.EnforceVerifyOrFail>)
+  @NotNull
+  public net.corda.testing.dsl.EnforceVerifyOrFail verifies()
 ##
-@net.corda.core.DoNotImplement public interface net.corda.testing.dsl.TransactionDSLInterpreter extends net.corda.testing.dsl.OutputStateLookup, net.corda.testing.dsl.Verifies
+@DoNotImplement
+public interface net.corda.testing.dsl.TransactionDSLInterpreter extends net.corda.testing.dsl.OutputStateLookup, net.corda.testing.dsl.Verifies
   public abstract void _attachment(String)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.testing.dsl.EnforceVerifyOrFail _tweak(kotlin.jvm.functions.Function1)
+  @NotNull
+  public abstract net.corda.testing.dsl.EnforceVerifyOrFail _tweak(kotlin.jvm.functions.Function1<? super net.corda.testing.dsl.TransactionDSLInterpreter, ? extends net.corda.testing.dsl.EnforceVerifyOrFail>)
   public abstract void attachment(net.corda.core.crypto.SecureHash)
-  public abstract void command(List, net.corda.core.contracts.CommandData)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.testing.dsl.LedgerDSLInterpreter getLedgerInterpreter()
+  public abstract void command(java.util.List<? extends java.security.PublicKey>, net.corda.core.contracts.CommandData)
+  @NotNull
+  public abstract net.corda.testing.dsl.LedgerDSLInterpreter<net.corda.testing.dsl.TransactionDSLInterpreter> getLedgerInterpreter()
   public abstract void input(net.corda.core.contracts.StateRef)
   public abstract void output(String, String, net.corda.core.identity.Party, Integer, net.corda.core.contracts.AttachmentConstraint, net.corda.core.contracts.ContractState)
   public abstract void timeWindow(net.corda.core.contracts.TimeWindow)
 ##
-@net.corda.core.DoNotImplement public interface net.corda.testing.dsl.Verifies
-  @org.jetbrains.annotations.NotNull public abstract net.corda.testing.dsl.EnforceVerifyOrFail fails()
-  @org.jetbrains.annotations.NotNull public abstract net.corda.testing.dsl.EnforceVerifyOrFail fails with(String)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.testing.dsl.EnforceVerifyOrFail failsWith(String)
-  @org.jetbrains.annotations.NotNull public abstract net.corda.testing.dsl.EnforceVerifyOrFail verifies()
+@DoNotImplement
+public interface net.corda.testing.dsl.Verifies
+  @NotNull
+  public abstract net.corda.testing.dsl.EnforceVerifyOrFail fails()
+  @NotNull
+  public abstract net.corda.testing.dsl.EnforceVerifyOrFail fails with(String)
+  @NotNull
+  public abstract net.corda.testing.dsl.EnforceVerifyOrFail failsWith(String)
+  @NotNull
+  public abstract net.corda.testing.dsl.EnforceVerifyOrFail verifies()
 ##
 public final class net.corda.testing.http.HttpApi extends java.lang.Object
   public <init>(java.net.URL, com.fasterxml.jackson.databind.ObjectMapper)
-  @org.jetbrains.annotations.NotNull public final com.fasterxml.jackson.databind.ObjectMapper getMapper()
-  @org.jetbrains.annotations.NotNull public final java.net.URL getRoot()
+  @NotNull
+  public final com.fasterxml.jackson.databind.ObjectMapper getMapper()
+  @NotNull
+  public final java.net.URL getRoot()
   public final void postJson(String, Object)
   public final void postPlain(String, String)
   public final void putJson(String, Object)
   public static final net.corda.testing.http.HttpApi$Companion Companion
 ##
 public static final class net.corda.testing.http.HttpApi$Companion extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final net.corda.testing.http.HttpApi fromHostAndPort(net.corda.core.utilities.NetworkHostAndPort, String, String, com.fasterxml.jackson.databind.ObjectMapper)
+  @NotNull
+  public final net.corda.testing.http.HttpApi fromHostAndPort(net.corda.core.utilities.NetworkHostAndPort, String, String, com.fasterxml.jackson.databind.ObjectMapper)
 ##
 public final class net.corda.testing.http.HttpUtils extends java.lang.Object
-  @org.jetbrains.annotations.NotNull public final com.fasterxml.jackson.databind.ObjectMapper getDefaultMapper()
+  @NotNull
+  public final com.fasterxml.jackson.databind.ObjectMapper getDefaultMapper()
   public final void postJson(java.net.URL, String)
   public final void postPlain(java.net.URL, String)
   public final void putJson(java.net.URL, String)
@@ -4765,13 +7171,21 @@ public final class net.corda.testing.http.HttpUtils extends java.lang.Object
 ##
 public final class net.corda.testing.services.MockAttachmentStorage extends net.corda.core.serialization.SingletonSerializeAsToken implements net.corda.core.node.services.AttachmentStorage
   public <init>()
-  @org.jetbrains.annotations.NotNull public final kotlin.Pair getAttachmentIdAndBytes(java.io.InputStream)
-  @org.jetbrains.annotations.NotNull public final Map getFiles()
+  @NotNull
+  public final kotlin.Pair<net.corda.core.crypto.SecureHash, byte[]> getAttachmentIdAndBytes(java.io.InputStream)
+  @NotNull
+  public final java.util.Map<net.corda.core.crypto.SecureHash, kotlin.Pair<net.corda.core.contracts.Attachment, byte[]>> getFiles()
   public boolean hasAttachment(net.corda.core.crypto.SecureHash)
-  @org.jetbrains.annotations.NotNull public net.corda.core.crypto.SecureHash importAttachment(java.io.InputStream)
-  @org.jetbrains.annotations.NotNull public net.corda.core.crypto.SecureHash importAttachment(java.io.InputStream, String, String)
-  @org.jetbrains.annotations.NotNull public final net.corda.core.crypto.SecureHash importContractAttachment(List, String, java.io.InputStream)
-  @org.jetbrains.annotations.NotNull public net.corda.core.crypto.SecureHash importOrGetAttachment(java.io.InputStream)
-  @org.jetbrains.annotations.Nullable public net.corda.core.contracts.Attachment openAttachment(net.corda.core.crypto.SecureHash)
-  @org.jetbrains.annotations.NotNull public List queryAttachments(net.corda.core.node.services.vault.AttachmentQueryCriteria, net.corda.core.node.services.vault.AttachmentSort)
+  @NotNull
+  public net.corda.core.crypto.SecureHash importAttachment(java.io.InputStream)
+  @NotNull
+  public net.corda.core.crypto.SecureHash importAttachment(java.io.InputStream, String, String)
+  @NotNull
+  public final net.corda.core.crypto.SecureHash importContractAttachment(java.util.List<String>, String, java.io.InputStream)
+  @NotNull
+  public net.corda.core.crypto.SecureHash importOrGetAttachment(java.io.InputStream)
+  @Nullable
+  public net.corda.core.contracts.Attachment openAttachment(net.corda.core.crypto.SecureHash)
+  @NotNull
+  public java.util.List<net.corda.core.crypto.SecureHash> queryAttachments(net.corda.core.node.services.vault.AttachmentQueryCriteria, net.corda.core.node.services.vault.AttachmentSort)
 ##
diff --git a/build.gradle b/build.gradle
index 69e67cfc01..af66200dd0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -120,9 +120,7 @@ buildscript {
         classpath "net.corda.plugins:quasar-utils:$gradle_plugins_version"
         classpath "net.corda.plugins:cordformation:$gradle_plugins_version"
         classpath "net.corda.plugins:cordapp:$gradle_plugins_version"
-        //TODO Anthony- this should be changed back to $gradle_plugins_version when the api-scaner is fixed
-//        classpath "net.corda.plugins:api-scanner:$gradle_plugins_version"
-        classpath "net.corda.plugins:api-scanner:4.0.15"
+        classpath "net.corda.plugins:api-scanner:$gradle_plugins_version"
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.15.0'
         classpath "org.jetbrains.kotlin:kotlin-noarg:$kotlin_version"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:${dokka_version}"
diff --git a/client/rpc/src/integration-test/kotlin/net/corda/client/rpc/BlacklistKotlinClosureTest.kt b/client/rpc/src/integration-test/kotlin/net/corda/client/rpc/BlacklistKotlinClosureTest.kt
index d6a5bf7390..aef9fdda7f 100644
--- a/client/rpc/src/integration-test/kotlin/net/corda/client/rpc/BlacklistKotlinClosureTest.kt
+++ b/client/rpc/src/integration-test/kotlin/net/corda/client/rpc/BlacklistKotlinClosureTest.kt
@@ -51,9 +51,9 @@ class BlacklistKotlinClosureTest : IntegrationTest() {
         driver(DriverParameters(startNodesInProcess = true)) {
             val rpc = startNode(providedName = ALICE_NAME).getOrThrow().rpc
             val packet = Packet { EVIL }
-            assertThatExceptionOfType(KryoException::class.java)
+            assertThatExceptionOfType(RPCException::class.java)
                     .isThrownBy { rpc.startFlow(::FlowC, packet) }
-                    .withMessageContaining("is not annotated or on the whitelist, so cannot be used in serialization")
+                    .withMessageContaining("is not on the whitelist or annotated with @CordaSerializable")
         }
     }
 }
\ No newline at end of file
diff --git a/client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt b/client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt
index ada8b59c3e..998a015c42 100644
--- a/client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt
+++ b/client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt
@@ -10,9 +10,10 @@
 
 package net.corda.client.rpc
 
-import net.corda.client.rpc.internal.CordaRPCClientConfigurationImpl
+
+import net.corda.client.rpc.internal.serialization.amqp.AMQPClientSerializationScheme
 import net.corda.client.rpc.internal.RPCClient
-import net.corda.client.rpc.internal.serialization.kryo.KryoClientSerializationScheme
+import net.corda.client.rpc.internal.CordaRPCClientConfigurationImpl
 import net.corda.core.context.Actor
 import net.corda.core.context.Trace
 import net.corda.core.messaging.CordaRPCOps
@@ -21,7 +22,7 @@ import net.corda.core.utilities.NetworkHostAndPort
 import net.corda.nodeapi.ArtemisTcpTransport.Companion.tcpTransport
 import net.corda.nodeapi.ConnectionDirection
 import net.corda.nodeapi.internal.config.SSLConfiguration
-import net.corda.nodeapi.internal.serialization.KRYO_RPC_CLIENT_CONTEXT
+import net.corda.nodeapi.internal.serialization.AMQP_RPC_CLIENT_CONTEXT
 import java.time.Duration
 
 /**
@@ -121,7 +122,9 @@ class CordaRPCClient private constructor(
         private val haAddressPool: List<NetworkHostAndPort> = emptyList()
 ) {
     @JvmOverloads
-    constructor(hostAndPort: NetworkHostAndPort, configuration: CordaRPCClientConfiguration = CordaRPCClientConfiguration.default()) : this(hostAndPort, configuration, null)
+    constructor(hostAndPort: NetworkHostAndPort,
+                configuration: CordaRPCClientConfiguration = CordaRPCClientConfiguration.default())
+            : this(hostAndPort, configuration, null)
 
     /**
      * @param haAddressPool A list of [NetworkHostAndPort] representing the addresses of servers in HA mode.
@@ -173,7 +176,7 @@ class CordaRPCClient private constructor(
             effectiveSerializationEnv
         } catch (e: IllegalStateException) {
             try {
-                KryoClientSerializationScheme.initialiseSerialization(classLoader)
+                AMQPClientSerializationScheme.initialiseSerialization()
             } catch (e: IllegalStateException) {
                 // Race e.g. two of these constructed in parallel, ignore.
             }
@@ -185,12 +188,12 @@ class CordaRPCClient private constructor(
             RPCClient(
                     tcpTransport(ConnectionDirection.Outbound(), hostAndPort, config = sslConfiguration),
                     configuration,
-                    if (classLoader != null) KRYO_RPC_CLIENT_CONTEXT.withClassLoader(classLoader) else KRYO_RPC_CLIENT_CONTEXT)
+                    if (classLoader != null) AMQP_RPC_CLIENT_CONTEXT.withClassLoader(classLoader) else AMQP_RPC_CLIENT_CONTEXT)
         } else {
             RPCClient(haAddressPool,
                     sslConfiguration,
                     configuration,
-                    if (classLoader != null) KRYO_RPC_CLIENT_CONTEXT.withClassLoader(classLoader) else KRYO_RPC_CLIENT_CONTEXT)
+                    if (classLoader != null) AMQP_RPC_CLIENT_CONTEXT.withClassLoader(classLoader) else AMQP_RPC_CLIENT_CONTEXT)
         }
     }
 
diff --git a/client/rpc/src/main/kotlin/net/corda/client/rpc/internal/RPCClientProxyHandler.kt b/client/rpc/src/main/kotlin/net/corda/client/rpc/internal/RPCClientProxyHandler.kt
index 867db59306..7dca661514 100644
--- a/client/rpc/src/main/kotlin/net/corda/client/rpc/internal/RPCClientProxyHandler.kt
+++ b/client/rpc/src/main/kotlin/net/corda/client/rpc/internal/RPCClientProxyHandler.kt
@@ -20,7 +20,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder
 import net.corda.client.rpc.CordaRPCClientConfiguration
 import net.corda.client.rpc.RPCException
 import net.corda.client.rpc.RPCSinceVersion
-import net.corda.client.rpc.internal.serialization.kryo.RpcClientObservableSerializer
+import net.corda.client.rpc.internal.serialization.amqp.RpcClientObservableSerializer
 import net.corda.core.context.Actor
 import net.corda.core.context.Trace
 import net.corda.core.context.Trace.InvocationId
diff --git a/client/rpc/src/main/kotlin/net/corda/client/rpc/internal/serialization/amqp/AMQPClientSerializationScheme.kt b/client/rpc/src/main/kotlin/net/corda/client/rpc/internal/serialization/amqp/AMQPClientSerializationScheme.kt
new file mode 100644
index 0000000000..c82779fc03
--- /dev/null
+++ b/client/rpc/src/main/kotlin/net/corda/client/rpc/internal/serialization/amqp/AMQPClientSerializationScheme.kt
@@ -0,0 +1,63 @@
+package net.corda.client.rpc.internal.serialization.amqp
+
+import net.corda.core.cordapp.Cordapp
+import net.corda.core.serialization.ClassWhitelist
+import net.corda.core.serialization.SerializationContext
+import net.corda.core.serialization.SerializationCustomSerializer
+import net.corda.core.serialization.internal.SerializationEnvironment
+import net.corda.core.serialization.internal.SerializationEnvironmentImpl
+import net.corda.core.serialization.internal.nodeSerializationEnv
+import net.corda.nodeapi.internal.serialization.*
+import net.corda.nodeapi.internal.serialization.amqp.AbstractAMQPSerializationScheme
+import net.corda.nodeapi.internal.serialization.amqp.SerializerFactory
+import net.corda.nodeapi.internal.serialization.amqp.amqpMagic
+import java.util.concurrent.ConcurrentHashMap
+import net.corda.nodeapi.internal.serialization.amqp.custom.RxNotificationSerializer
+
+/**
+ * When set as the serialization scheme for a process, sets it to be the Corda AMQP implementation.
+ * This scheme is for use by the RPC Client calls.
+ */
+class AMQPClientSerializationScheme(
+            cordappCustomSerializers: Set<SerializationCustomSerializer<*,*>>,
+            serializerFactoriesForContexts: MutableMap<Pair<ClassWhitelist, ClassLoader>, SerializerFactory>
+    ) : AbstractAMQPSerializationScheme(cordappCustomSerializers, serializerFactoriesForContexts) {
+        constructor(cordapps: List<Cordapp>) : this(cordapps.customSerializers, ConcurrentHashMap())
+
+        @Suppress("UNUSED")
+        constructor() : this(emptySet(), ConcurrentHashMap())
+
+    companion object {
+        /** Call from main only. */
+        fun initialiseSerialization() {
+            nodeSerializationEnv = createSerializationEnv()
+        }
+
+        fun createSerializationEnv(): SerializationEnvironment {
+            return SerializationEnvironmentImpl(
+                    SerializationFactoryImpl().apply {
+                        registerScheme(AMQPClientSerializationScheme(emptyList()))
+                    },
+                    storageContext = AMQP_STORAGE_CONTEXT,
+                    p2pContext = AMQP_P2P_CONTEXT,
+                    rpcClientContext = AMQP_RPC_CLIENT_CONTEXT,
+                    rpcServerContext = AMQP_RPC_SERVER_CONTEXT)
+        }
+    }
+
+    override fun canDeserializeVersion(magic: CordaSerializationMagic, target: SerializationContext.UseCase) =
+        magic == amqpMagic && (
+            target == SerializationContext.UseCase.RPCClient || target == SerializationContext.UseCase.P2P)
+
+    override fun rpcClientSerializerFactory(context: SerializationContext): SerializerFactory {
+        return SerializerFactory(context.whitelist, ClassLoader.getSystemClassLoader()).apply {
+            register(RpcClientObservableSerializer)
+            register(RpcClientCordaFutureSerializer(this))
+            register(RxNotificationSerializer(this))
+        }
+    }
+
+    override fun rpcServerSerializerFactory(context: SerializationContext): SerializerFactory {
+        throw UnsupportedOperationException()
+    }
+}
\ No newline at end of file
diff --git a/client/rpc/src/main/kotlin/net/corda/client/rpc/internal/serialization/amqp/RpcClientCordaFutureSerializer.kt b/client/rpc/src/main/kotlin/net/corda/client/rpc/internal/serialization/amqp/RpcClientCordaFutureSerializer.kt
new file mode 100644
index 0000000000..258a2d66ec
--- /dev/null
+++ b/client/rpc/src/main/kotlin/net/corda/client/rpc/internal/serialization/amqp/RpcClientCordaFutureSerializer.kt
@@ -0,0 +1,35 @@
+package net.corda.client.rpc.internal.serialization.amqp
+
+import net.corda.core.concurrent.CordaFuture
+import net.corda.core.toFuture
+import net.corda.core.toObservable
+import net.corda.nodeapi.internal.serialization.amqp.CustomSerializer
+import net.corda.nodeapi.internal.serialization.amqp.SerializerFactory
+import rx.Observable
+import java.io.NotSerializableException
+
+/**
+ * Serializer for [CordaFuture] instances that can only deserialize such objects (just as the server
+ * side can only serialize them). Futures will have been converted to an Rx [Observable] for serialization.
+ */
+class RpcClientCordaFutureSerializer (factory: SerializerFactory)
+    : CustomSerializer.Proxy<CordaFuture<*>, RpcClientCordaFutureSerializer.FutureProxy>(
+        CordaFuture::class.java,
+        RpcClientCordaFutureSerializer.FutureProxy::class.java, factory
+) {
+    override fun fromProxy(proxy: FutureProxy): CordaFuture<*> {
+        try {
+            return proxy.observable.toFuture()
+        } catch (e: NotSerializableException) {
+            throw NotSerializableException("Failed to deserialize Future from proxy Observable - ${e.message}\n").apply {
+                initCause(e.cause)
+            }
+        }
+    }
+
+    override fun toProxy(obj: CordaFuture<*>): FutureProxy {
+        throw UnsupportedOperationException()
+    }
+
+    data class FutureProxy(val observable: Observable<*>)
+}
\ No newline at end of file
diff --git a/client/rpc/src/main/kotlin/net/corda/client/rpc/internal/serialization/amqp/RpcClientObservableSerializer.kt b/client/rpc/src/main/kotlin/net/corda/client/rpc/internal/serialization/amqp/RpcClientObservableSerializer.kt
new file mode 100644
index 0000000000..18a73afa71
--- /dev/null
+++ b/client/rpc/src/main/kotlin/net/corda/client/rpc/internal/serialization/amqp/RpcClientObservableSerializer.kt
@@ -0,0 +1,127 @@
+package net.corda.client.rpc.internal.serialization.amqp
+
+
+import net.corda.client.rpc.internal.ObservableContext
+import net.corda.core.context.Trace
+import net.corda.core.serialization.SerializationContext
+import net.corda.nodeapi.RPCApi
+import net.corda.nodeapi.internal.serialization.amqp.*
+import org.apache.qpid.proton.codec.Data
+import rx.Notification
+import rx.Observable
+import rx.subjects.UnicastSubject
+import java.io.NotSerializableException
+import java.lang.reflect.Type
+import java.time.Instant
+import java.util.concurrent.atomic.AtomicInteger
+import javax.transaction.NotSupportedException
+
+/**
+ * Serializer for Rx[Observable] instances for the RPC Client library. Can only be used to deserialize such objects,
+ * just as the corresponding RPC server side code can only serialize them. Observables are only notionally serialized,
+ * what is actually sent is a reference to the observable that can then be subscribed to.
+ */
+object RpcClientObservableSerializer : CustomSerializer.Implements<Observable<*>>(Observable::class.java) {
+    private object RpcObservableContextKey
+
+    fun createContext(
+            serializationContext: SerializationContext,
+            observableContext: ObservableContext
+    ) = serializationContext.withProperty(RpcObservableContextKey, observableContext)
+
+    private fun <T> pinInSubscriptions(observable: Observable<T>, hardReferenceStore: MutableSet<Observable<*>>): Observable<T> {
+        val refCount = AtomicInteger(0)
+        return observable.doOnSubscribe {
+            if (refCount.getAndIncrement() == 0) {
+                require(hardReferenceStore.add(observable)) {
+                    "Reference store already contained reference $this on add"
+                }
+            }
+        }.doOnUnsubscribe {
+            if (refCount.decrementAndGet() == 0) {
+                require(hardReferenceStore.remove(observable)) {
+                    "Reference store did not contain reference $this on remove"
+                }
+            }
+        }
+    }
+
+    override val schemaForDocumentation = Schema(
+            listOf(
+                    CompositeType(
+                            name = type.toString(),
+                            label = "",
+                            provides = emptyList(),
+                            descriptor = descriptor,
+                            fields = listOf(
+                                    Field(
+                                            name = "observableId",
+                                            type = "string",
+                                            requires = emptyList(),
+                                            default = null,
+                                            label = null,
+                                            mandatory = true,
+                                            multiple = false),
+                                    Field(
+                                            name = "observableInstant",
+                                            type = "long",
+                                            requires = emptyList(),
+                                            default = null,
+                                            label = null,
+                                            mandatory = true,
+                                            multiple = false)
+                            ))))
+
+    /**
+     * Converts the serialized form, a blob, back into an Observable
+     */
+    override fun readObject(obj: Any, schemas: SerializationSchemas, input: DeserializationInput,
+                            context: SerializationContext
+    ): Observable<*> {
+        if (RpcObservableContextKey !in context.properties) {
+            throw NotSerializableException("Missing Observable Context Key on Client Context")
+        }
+
+        val observableContext =
+                context.properties[RpcClientObservableSerializer.RpcObservableContextKey] as ObservableContext
+
+        if (obj !is List<*>) throw NotSerializableException("Input must be a serialised list")
+        if (obj.size != 2) throw NotSerializableException("Expecting two elements, have ${obj.size}")
+
+        val observableId: Trace.InvocationId = Trace.InvocationId((obj[0] as String), Instant.ofEpochMilli((obj[1] as Long)))
+        val observable = UnicastSubject.create<Notification<*>>()
+
+        require(observableContext.observableMap.getIfPresent(observableId) == null) {
+            "Multiple Observables arrived with the same ID $observableId"
+        }
+
+        val rpcCallSite = getRpcCallSite(context, observableContext)
+
+        observableContext.observableMap.put(observableId, observable)
+        observableContext.callSiteMap?.put(observableId, rpcCallSite)
+
+        // We pin all Observables into a hard reference store (rooted in the RPC proxy) on subscription so that users
+        // don't need to store a reference to the Observables themselves.
+        return pinInSubscriptions(observable, observableContext.hardReferenceStore).doOnUnsubscribe {
+            // This causes Future completions to give warnings because the corresponding OnComplete sent from the server
+            // will arrive after the client unsubscribes from the observable and consequently invalidates the mapping.
+            // The unsubscribe is due to [ObservableToFuture]'s use of first().
+            observableContext.observableMap.invalidate(observableId)
+        }.dematerialize<Any>()
+    }
+
+    private fun getRpcCallSite(context: SerializationContext, observableContext: ObservableContext): Throwable? {
+        val rpcRequestOrObservableId = context.properties[RPCApi.RpcRequestOrObservableIdKey] as Trace.InvocationId
+        return observableContext.callSiteMap?.get(rpcRequestOrObservableId)
+    }
+
+    override fun writeDescribedObject(
+            obj: Observable<*>,
+            data: Data,
+            type: Type,
+            output: SerializationOutput,
+            context: SerializationContext
+    ) {
+        throw NotSupportedException()
+    }
+}
\ No newline at end of file
diff --git a/client/rpc/src/main/kotlin/net/corda/client/rpc/internal/serialization/kryo/KryoClientSerializationScheme.kt b/client/rpc/src/main/kotlin/net/corda/client/rpc/internal/serialization/kryo/KryoClientSerializationScheme.kt
deleted file mode 100644
index 3b8f7e4fdb..0000000000
--- a/client/rpc/src/main/kotlin/net/corda/client/rpc/internal/serialization/kryo/KryoClientSerializationScheme.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * R3 Proprietary and Confidential
- *
- * Copyright (c) 2018 R3 Limited.  All rights reserved.
- *
- * The intellectual and technical concepts contained herein are proprietary to R3 and its suppliers and are protected by trade secret law.
- *
- * Distribution of this file or any portion thereof via any medium without the express permission of R3 is strictly prohibited.
- */
-
-package net.corda.client.rpc.internal.serialization.kryo
-
-import com.esotericsoftware.kryo.pool.KryoPool
-import net.corda.core.serialization.SerializationContext
-import net.corda.nodeapi.internal.serialization.CordaSerializationMagic
-import net.corda.core.serialization.internal.SerializationEnvironment
-import net.corda.core.serialization.internal.SerializationEnvironmentImpl
-import net.corda.core.serialization.internal.nodeSerializationEnv
-import net.corda.nodeapi.internal.serialization.AMQP_P2P_CONTEXT
-import net.corda.nodeapi.internal.serialization.KRYO_RPC_CLIENT_CONTEXT
-import net.corda.nodeapi.internal.serialization.SerializationFactoryImpl
-import net.corda.nodeapi.internal.serialization.amqp.AMQPClientSerializationScheme
-import net.corda.nodeapi.internal.serialization.kryo.AbstractKryoSerializationScheme
-import net.corda.nodeapi.internal.serialization.kryo.DefaultKryoCustomizer
-import net.corda.nodeapi.internal.serialization.kryo.kryoMagic
-import net.corda.nodeapi.internal.serialization.kryo.RPCKryo
-
-class KryoClientSerializationScheme : AbstractKryoSerializationScheme() {
-    override fun canDeserializeVersion(magic: CordaSerializationMagic, target: SerializationContext.UseCase): Boolean {
-        return magic == kryoMagic && (target == SerializationContext.UseCase.RPCClient || target == SerializationContext.UseCase.P2P)
-    }
-
-    override fun rpcClientKryoPool(context: SerializationContext): KryoPool {
-        return KryoPool.Builder {
-            DefaultKryoCustomizer.customize(RPCKryo(RpcClientObservableSerializer, context), publicKeySerializer).apply {
-                classLoader = context.deserializationClassLoader
-            }
-        }.build()
-    }
-
-    // We're on the client and don't have access to server classes.
-    override fun rpcServerKryoPool(context: SerializationContext): KryoPool = throw UnsupportedOperationException()
-
-    companion object {
-        /** Call from main only. */
-        fun initialiseSerialization(classLoader: ClassLoader? = null) {
-            nodeSerializationEnv = createSerializationEnv(classLoader)
-        }
-
-        fun createSerializationEnv(classLoader: ClassLoader? = null): SerializationEnvironment {
-            return SerializationEnvironmentImpl(
-                    SerializationFactoryImpl().apply {
-                        registerScheme(KryoClientSerializationScheme())
-                        registerScheme(AMQPClientSerializationScheme(emptyList()))
-                    },
-                    if (classLoader != null) AMQP_P2P_CONTEXT.withClassLoader(classLoader) else AMQP_P2P_CONTEXT,
-                    rpcClientContext = if (classLoader != null) KRYO_RPC_CLIENT_CONTEXT.withClassLoader(classLoader) else KRYO_RPC_CLIENT_CONTEXT)
-        }
-    }
-}
\ No newline at end of file
diff --git a/client/rpc/src/main/kotlin/net/corda/client/rpc/internal/serialization/kryo/RpcClientObservableSerializer.kt b/client/rpc/src/main/kotlin/net/corda/client/rpc/internal/serialization/kryo/RpcClientObservableSerializer.kt
deleted file mode 100644
index 99749093e2..0000000000
--- a/client/rpc/src/main/kotlin/net/corda/client/rpc/internal/serialization/kryo/RpcClientObservableSerializer.kt
+++ /dev/null
@@ -1,75 +0,0 @@
-package net.corda.client.rpc.internal.serialization.kryo
-
-import com.esotericsoftware.kryo.Kryo
-import com.esotericsoftware.kryo.Serializer
-import com.esotericsoftware.kryo.io.Input
-import com.esotericsoftware.kryo.io.Output
-import net.corda.client.rpc.internal.ObservableContext
-import net.corda.core.context.Trace
-import net.corda.core.serialization.SerializationContext
-import net.corda.nodeapi.RPCApi
-import rx.Notification
-import rx.Observable
-import rx.subjects.UnicastSubject
-import java.time.Instant
-import java.util.concurrent.atomic.AtomicInteger
-
-/**
- * A [Serializer] to deserialise Observables once the corresponding Kryo instance has been provided with an [ObservableContext].
- */
-object RpcClientObservableSerializer : Serializer<Observable<*>>() {
-    private object RpcObservableContextKey
-
-    fun createContext(serializationContext: SerializationContext, observableContext: ObservableContext): SerializationContext {
-        return serializationContext.withProperty(RpcObservableContextKey, observableContext)
-    }
-
-    private fun <T> pinInSubscriptions(observable: Observable<T>, hardReferenceStore: MutableSet<Observable<*>>): Observable<T> {
-        val refCount = AtomicInteger(0)
-        return observable.doOnSubscribe {
-            if (refCount.getAndIncrement() == 0) {
-                require(hardReferenceStore.add(observable)) { "Reference store already contained reference $this on add" }
-            }
-        }.doOnUnsubscribe {
-            if (refCount.decrementAndGet() == 0) {
-                require(hardReferenceStore.remove(observable)) { "Reference store did not contain reference $this on remove" }
-            }
-        }
-    }
-
-    override fun read(kryo: Kryo, input: Input, type: Class<Observable<*>>): Observable<Any> {
-        val observableContext = kryo.context[RpcObservableContextKey] as ObservableContext
-        val observableId = input.readInvocationId() ?: throw IllegalStateException("Unable to read invocationId from Input.")
-        val observable = UnicastSubject.create<Notification<*>>()
-        require(observableContext.observableMap.getIfPresent(observableId) == null) {
-            "Multiple Observables arrived with the same ID $observableId"
-        }
-        val rpcCallSite = getRpcCallSite(kryo, observableContext)
-        observableContext.observableMap.put(observableId, observable)
-        observableContext.callSiteMap?.put(observableId, rpcCallSite)
-        // We pin all Observables into a hard reference store (rooted in the RPC proxy) on subscription so that users
-        // don't need to store a reference to the Observables themselves.
-        return pinInSubscriptions(observable, observableContext.hardReferenceStore).doOnUnsubscribe {
-            // This causes Future completions to give warnings because the corresponding OnComplete sent from the server
-            // will arrive after the client unsubscribes from the observable and consequently invalidates the mapping.
-            // The unsubscribe is due to [ObservableToFuture]'s use of first().
-            observableContext.observableMap.invalidate(observableId)
-        }.dematerialize()
-    }
-
-    private fun Input.readInvocationId(): Trace.InvocationId? {
-
-        val value = readString() ?: return null
-        val timestamp = readLong()
-        return Trace.InvocationId(value, Instant.ofEpochMilli(timestamp))
-    }
-
-    override fun write(kryo: Kryo, output: Output, observable: Observable<*>) {
-        throw UnsupportedOperationException("Cannot serialise Observables on the client side")
-    }
-
-    private fun getRpcCallSite(kryo: Kryo, observableContext: ObservableContext): Throwable? {
-        val rpcRequestOrObservableId = kryo.context[RPCApi.RpcRequestOrObservableIdKey] as Trace.InvocationId
-        return observableContext.callSiteMap?.get(rpcRequestOrObservableId)
-    }
-}
diff --git a/client/rpc/src/test/kotlin/net/corda/client/rpc/ClientRPCInfrastructureTests.kt b/client/rpc/src/test/kotlin/net/corda/client/rpc/ClientRPCInfrastructureTests.kt
index ae85e14ab1..8af4fea03e 100644
--- a/client/rpc/src/test/kotlin/net/corda/client/rpc/ClientRPCInfrastructureTests.kt
+++ b/client/rpc/src/test/kotlin/net/corda/client/rpc/ClientRPCInfrastructureTests.kt
@@ -10,6 +10,7 @@
 
 package net.corda.client.rpc
 
+import net.corda.core.CordaRuntimeException
 import net.corda.core.concurrent.CordaFuture
 import net.corda.core.internal.concurrent.doneFuture
 import net.corda.core.internal.concurrent.openFuture
@@ -21,6 +22,7 @@ import net.corda.testing.node.internal.RPCDriverDSL
 import net.corda.testing.node.internal.rpcDriver
 import net.corda.testing.node.internal.rpcTestUser
 import org.assertj.core.api.Assertions.assertThat
+import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
@@ -87,9 +89,10 @@ class ClientRPCInfrastructureTests : AbstractRPCTest() {
             // Does nothing, doesn't throw.
             proxy.void()
 
-            assertEquals("Barf!", assertFailsWith<IllegalArgumentException> {
-                proxy.barf()
-            }.message)
+            assertThatThrownBy { proxy.barf() }
+                    .isInstanceOf(CordaRuntimeException::class.java)
+                    .hasMessage("java.lang.IllegalArgumentException: Barf!")
+
 
             assertEquals("hi 5", proxy.someCalculation("hi", 5))
         }
diff --git a/client/rpc/src/test/kotlin/net/corda/client/rpc/RPCFailureTests.kt b/client/rpc/src/test/kotlin/net/corda/client/rpc/RPCFailureTests.kt
index f55a4b012a..7b338ddd0e 100644
--- a/client/rpc/src/test/kotlin/net/corda/client/rpc/RPCFailureTests.kt
+++ b/client/rpc/src/test/kotlin/net/corda/client/rpc/RPCFailureTests.kt
@@ -10,7 +10,7 @@
 
 package net.corda.client.rpc
 
-import com.esotericsoftware.kryo.KryoException
+import net.corda.core.CordaRuntimeException
 import net.corda.core.concurrent.CordaFuture
 import net.corda.core.internal.concurrent.openFuture
 import net.corda.core.messaging.*
@@ -58,23 +58,29 @@ class RPCFailureTests {
 
     @Test
     fun `kotlin NPE`() = rpc {
-        assertThatThrownBy { it.kotlinNPE() }.isInstanceOf(KotlinNullPointerException::class.java)
+        assertThatThrownBy { it.kotlinNPE() }.isInstanceOf(CordaRuntimeException::class.java)
+                .hasMessageContaining("kotlin.KotlinNullPointerException")
     }
 
     @Test
     fun `kotlin NPE async`() = rpc {
         val future = it.kotlinNPEAsync()
-        assertThatThrownBy { future.getOrThrow() }.isInstanceOf(KotlinNullPointerException::class.java)
+        assertThatThrownBy { future.getOrThrow() }.isInstanceOf(CordaRuntimeException::class.java)
+                .hasMessageContaining("kotlin.KotlinNullPointerException")
     }
 
     @Test
-    fun unserializable() = rpc {
-        assertThatThrownBy { it.getUnserializable() }.isInstanceOf(KryoException::class.java)
+    fun `unserializable`() = rpc {
+        assertThatThrownBy { it.getUnserializable() }.isInstanceOf(CordaRuntimeException::class.java)
+                .hasMessageContaining("java.io.NotSerializableException:")
+                .hasMessageContaining("Unserializable is not on the whitelist or annotated with @CordaSerializable.")
     }
 
     @Test
     fun `unserializable async`() = rpc {
         val future = it.getUnserializableAsync()
-        assertThatThrownBy { future.getOrThrow() }.isInstanceOf(KryoException::class.java)
+        assertThatThrownBy { future.getOrThrow() }.isInstanceOf(CordaRuntimeException::class.java)
+                .hasMessageContaining("java.io.NotSerializableException:")
+                .hasMessageContaining("Unserializable is not on the whitelist or annotated with @CordaSerializable.")
     }
 }
diff --git a/core/src/main/kotlin/net/corda/core/concurrent/CordaFuture.kt b/core/src/main/kotlin/net/corda/core/concurrent/CordaFuture.kt
index ee03f8c311..260a3531e4 100644
--- a/core/src/main/kotlin/net/corda/core/concurrent/CordaFuture.kt
+++ b/core/src/main/kotlin/net/corda/core/concurrent/CordaFuture.kt
@@ -10,6 +10,7 @@
 
 package net.corda.core.concurrent
 
+import net.corda.core.serialization.CordaSerializable
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.Future
 
@@ -17,6 +18,7 @@ import java.util.concurrent.Future
  * Same as [Future] with additional methods to provide some of the features of [java.util.concurrent.CompletableFuture] while minimising the API surface area.
  * In Kotlin, to avoid compile errors, whenever CordaFuture is used in a parameter or extension method receiver type, its type parameter should be specified with out variance.
  */
+@CordaSerializable
 interface CordaFuture<V> : Future<V> {
     /**
      * Run the given callback when this future is done, on the completion thread.
diff --git a/core/src/main/kotlin/net/corda/core/messaging/FlowHandle.kt b/core/src/main/kotlin/net/corda/core/messaging/FlowHandle.kt
index 1caae11f1d..be7947b848 100644
--- a/core/src/main/kotlin/net/corda/core/messaging/FlowHandle.kt
+++ b/core/src/main/kotlin/net/corda/core/messaging/FlowHandle.kt
@@ -20,6 +20,7 @@ import rx.Observable
  * [FlowHandle] is a serialisable handle for the started flow, parameterised by the type of the flow's return value.
  */
 @DoNotImplement
+@CordaSerializable
 interface FlowHandle<A> : AutoCloseable {
     /**
      * The started state machine's ID.
diff --git a/core/src/main/kotlin/net/corda/core/node/services/vault/QueryCriteria.kt b/core/src/main/kotlin/net/corda/core/node/services/vault/QueryCriteria.kt
index 1ba2ec0dcf..1e1f16a0e0 100644
--- a/core/src/main/kotlin/net/corda/core/node/services/vault/QueryCriteria.kt
+++ b/core/src/main/kotlin/net/corda/core/node/services/vault/QueryCriteria.kt
@@ -124,11 +124,7 @@ sealed class QueryCriteria : GenericQueryCriteria<QueryCriteria, IQueryCriteriaP
     }
 
     /**
-     * FungibleStateQueryCriteria: provides query by attributes defined in [VaultSchema.VaultFungibleState]
-     *
-     * Valid TokenType implementations defined by Amount<T> are
-     *   [Currency] as used in [Cash] contract state
-     *   [Commodity] as used in [CommodityContract] state
+     * FungibleStateQueryCriteria: provides query by attributes defined in [VaultSchema.VaultFungibleStates]
      */
     data class FungibleAssetQueryCriteria @JvmOverloads constructor(val participants: List<AbstractParty>? = null,
                                                                     val owner: List<AbstractParty>? = null,
@@ -150,8 +146,6 @@ sealed class QueryCriteria : GenericQueryCriteria<QueryCriteria, IQueryCriteriaP
      *
      * Params
      *  [expression] refers to a (composable) type safe [CriteriaExpression]
-     *
-     * Refer to [CommercialPaper.State] for a concrete example.
      */
     data class VaultCustomQueryCriteria<L : PersistentState> @JvmOverloads constructor
     (val expression: CriteriaExpression<L, Boolean>,
diff --git a/core/src/main/kotlin/net/corda/core/serialization/SerializationAPI.kt b/core/src/main/kotlin/net/corda/core/serialization/SerializationAPI.kt
index 5fb794c78e..46b826471b 100644
--- a/core/src/main/kotlin/net/corda/core/serialization/SerializationAPI.kt
+++ b/core/src/main/kotlin/net/corda/core/serialization/SerializationAPI.kt
@@ -195,6 +195,15 @@ interface SerializationContext {
     enum class UseCase { P2P, RPCServer, RPCClient, Storage, Checkpoint, Testing }
 }
 
+/**
+ * Set of well known properties that may be set on a serialization context. This doesn't preclude
+ * others being set that aren't keyed on this enumeration, but for general use properties adding a
+ * well known key here is preferred.
+ */
+enum class ContextPropertyKeys {
+    SERIALIZERS
+}
+
 /**
  * Global singletons to be used as defaults that are injected elsewhere (generally, in the node or in RPC client).
  */
diff --git a/core/src/main/kotlin/net/corda/core/serialization/SerializationCustomSerializer.kt b/core/src/main/kotlin/net/corda/core/serialization/SerializationCustomSerializer.kt
index 53954e68f1..b2b1ce6236 100644
--- a/core/src/main/kotlin/net/corda/core/serialization/SerializationCustomSerializer.kt
+++ b/core/src/main/kotlin/net/corda/core/serialization/SerializationCustomSerializer.kt
@@ -16,7 +16,7 @@ package net.corda.core.serialization
  * a proxy serializer can be written that extends this type whose purpose is to move between those an
  * unserializable types and an intermediate representation.
  *
- * NOTE: The proxy object should be specified as a seperate class. However, this can be defined within the
+ * NOTE: The proxy object should be specified as a separate class. However, this can be defined within the
  * scope of the custom serializer.
  */
 interface SerializationCustomSerializer<OBJ, PROXY> {
diff --git a/core/src/test/kotlin/net/corda/core/utilities/KotlinUtilsTest.kt b/core/src/test/kotlin/net/corda/core/utilities/KotlinUtilsTest.kt
index 802c2373a6..aef920973a 100644
--- a/core/src/test/kotlin/net/corda/core/utilities/KotlinUtilsTest.kt
+++ b/core/src/test/kotlin/net/corda/core/utilities/KotlinUtilsTest.kt
@@ -12,16 +12,20 @@ package net.corda.core.utilities
 
 import com.esotericsoftware.kryo.KryoException
 import net.corda.core.crypto.random63BitValue
-import net.corda.core.serialization.CordaSerializable
-import net.corda.core.serialization.deserialize
-import net.corda.core.serialization.serialize
+import net.corda.core.serialization.*
 import net.corda.nodeapi.internal.serialization.KRYO_CHECKPOINT_CONTEXT
+import net.corda.nodeapi.internal.serialization.SerializationContextImpl
+import net.corda.nodeapi.internal.serialization.kryo.kryoMagic
 import net.corda.testing.core.SerializationEnvironmentRule
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.ExpectedException
 
+object EmptyWhitelist : ClassWhitelist {
+    override fun hasListed(type: Class<*>): Boolean = false
+}
+
 class KotlinUtilsTest {
     @Rule
     @JvmField
@@ -30,6 +34,14 @@ class KotlinUtilsTest {
     @Rule
     val expectedEx: ExpectedException = ExpectedException.none()
 
+    val KRYO_CHECKPOINT_NOWHITELIST_CONTEXT = SerializationContextImpl(kryoMagic,
+            SerializationDefaults.javaClass.classLoader,
+            EmptyWhitelist,
+            emptyMap(),
+            true,
+            SerializationContext.UseCase.Checkpoint,
+            null)
+
     @Test
     fun `transient property which is null`() {
         val test = NullTransientProperty()
@@ -53,7 +65,8 @@ class KotlinUtilsTest {
         expectedEx.expect(KryoException::class.java)
         expectedEx.expectMessage("is not annotated or on the whitelist, so cannot be used in serialization")
         val original = NonCapturingTransientProperty()
-        original.serialize(context = KRYO_CHECKPOINT_CONTEXT.withEncoding(null)).deserialize()
+        original.serialize(context = KRYO_CHECKPOINT_CONTEXT.withEncoding(null))
+                .deserialize(context = KRYO_CHECKPOINT_NOWHITELIST_CONTEXT)
     }
 
     @Test
@@ -71,8 +84,10 @@ class KotlinUtilsTest {
     fun `deserialise transient property with capturing lambda`() {
         expectedEx.expect(KryoException::class.java)
         expectedEx.expectMessage("is not annotated or on the whitelist, so cannot be used in serialization")
+
         val original = CapturingTransientProperty("Hello")
-        original.serialize(context = KRYO_CHECKPOINT_CONTEXT.withEncoding(null)).deserialize()
+        original.serialize(context = KRYO_CHECKPOINT_CONTEXT.withEncoding(null))
+                .deserialize(context = KRYO_CHECKPOINT_NOWHITELIST_CONTEXT)
     }
 
     private class NullTransientProperty {
diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
index 7c133c4366..5e2e6f1d2f 100644
--- a/docs/source/changelog.rst
+++ b/docs/source/changelog.rst
@@ -6,6 +6,10 @@ release, see :doc:`upgrade-notes`.
 
 Unreleased
 ==========
+
+* RPC Framework moved from Kryo to the Corda AMQP implementation [Corda-847]. This completes the removal
+  of ``Kryo`` from general use within Corda, remaining only for use in flow checkpointing. 
+
 * Set co.paralleluniverse.fibers.verifyInstrumentation=true in devMode.
 
 * Node will now gracefully fail to start if one of the required ports is already in use.
diff --git a/docs/source/corda-configuration-file.rst b/docs/source/corda-configuration-file.rst
index a9151e6fe1..e4973b7662 100644
--- a/docs/source/corda-configuration-file.rst
+++ b/docs/source/corda-configuration-file.rst
@@ -238,6 +238,13 @@ absolute path to the node's base directory.
 
                 .. note:: This is temporary feature for onboarding network participants that limits their visibility for privacy reasons.
 
+:tlsCertCrlDistPoint: CRL distribution point (i.e. URL) for the TLS certificate. Default value is NULL, which indicates no CRL availability for the TLS certificate.
+                      Note: If crlCheckSoftFail is FALSE (meaning that there is the strict CRL checking mode) this value needs to be set.
+
+:tlsCertCrlIssuer: CRL issuer (given in the X500 name format) for the TLS certificate. Default value is NULL,
+                   which indicates that the issuer of the TLS certificate is also the issuer of the CRL.
+                   Note: If this parameter is set then the tlsCertCrlDistPoint needs to be set as well.
+
 Examples
 --------
 
@@ -327,4 +334,4 @@ path to the node's base directory.
         :permissions: A list of permissions for starting flows via RPC. To give the user the permission to start the flow
             ``foo.bar.FlowClass``, add the string ``StartFlow.foo.bar.FlowClass`` to the list. If the list
             contains the string ``ALL``, the user can start any flow via RPC. This value is intended for administrator
-            users and for development.
+            users and for development.
\ No newline at end of file
diff --git a/docs/source/event-scheduling.rst b/docs/source/event-scheduling.rst
index ce77035b8c..34633c61dc 100644
--- a/docs/source/event-scheduling.rst
+++ b/docs/source/event-scheduling.rst
@@ -52,9 +52,6 @@ There are two main steps to implementing scheduled events:
 .. note:: The scheduler's clock always operates in the UTC time zone for uniformity, so any time zone logic must be
    performed by the contract, using ``ZonedDateTime``.
 
-In the short term, until we have automatic flow session set up, you will also likely need to install a network
-handler to help with obtaining a unique and secure random session.  An example is described below.
-
 The production and consumption of ``ContractStates`` is observed by the scheduler and the activities associated with
 any consumed states are unscheduled.  Any newly produced states are then queried via the ``nextScheduledActivity``
 method and if they do not return ``null`` then that activity is scheduled based on the content of the
@@ -82,11 +79,3 @@ should become available and schedules an activity at that time to work out what
 business process and to take on those roles.  That ``FlowLogic`` will be handed the ``StateRef`` for the interest
 rate swap ``State`` in question, as well as a tolerance ``Duration`` of how long to wait after the activity is triggered
 for the interest rate before indicating an error.
-
-.. note:: This is a way to create a reference to the FlowLogic class and its constructor parameters to instantiate.
-
-As previously mentioned, we currently need a small network handler to assist with session setup until the work to
-automate that is complete.  See the interest rate swap specific implementation ``FixingSessionInitiationHandler`` which
-is responsible for starting a ``FlowLogic`` to perform one role in the fixing flow with the ``sessionID`` sent
-by the ``FixingRoleDecider`` on the other node which then launches the other role in the fixing flow.  Currently
-the handler needs to be manually installed in the node.
diff --git a/docs/source/network-map.rst b/docs/source/network-map.rst
index 78da763990..409b91f84a 100644
--- a/docs/source/network-map.rst
+++ b/docs/source/network-map.rst
@@ -105,11 +105,9 @@ The current set of network parameters:
 :notaries: List of identity and validation type (either validating or non-validating) of the notaries which are permitted
         in the compatibility zone.
 
-:maxMessageSize: (This is currently ignored. However, it will be wired up in a future release.)
-
-.. TODO Replace the above with this once wired: Maximum allowed size in bytes of an individual message sent over the wire. Note that attachments are
-        a special case and may be fragmented for streaming transfer, however, an individual transaction or flow message
-        may not be larger than this value.
+:maxMessageSize: Maximum allowed size in bytes of an individual message sent over the wire. Note that attachments are
+            a special case and may be fragmented for streaming transfer, however, an individual transaction or flow message
+            may not be larger than this value.
 
 :maxTransactionSize: Maximum allowed size in bytes of a transaction. This is the size of the transaction object and its attachments.
 
diff --git a/node-api/build.gradle b/node-api/build.gradle
index 15bcdfc640..1c9bc4891c 100644
--- a/node-api/build.gradle
+++ b/node-api/build.gradle
@@ -76,6 +76,11 @@ dependencies {
     testCompile "junit:junit:$junit_version"
     testCompile "org.assertj:assertj-core:$assertj_version"
     testCompile project(':node-driver')
+
+    compile ("org.apache.activemq:artemis-amqp-protocol:${artemis_version}") {
+        // Gains our proton-j version from core module.
+        exclude group: 'org.apache.qpid', module: 'proton-j'
+    }
 }
 
 configurations {
diff --git a/node-api/src/main/kotlin/net/corda/nodeapi/exceptions/InternalNodeException.kt b/node-api/src/main/kotlin/net/corda/nodeapi/exceptions/InternalNodeException.kt
index 0751e2681a..78e6dee579 100644
--- a/node-api/src/main/kotlin/net/corda/nodeapi/exceptions/InternalNodeException.kt
+++ b/node-api/src/main/kotlin/net/corda/nodeapi/exceptions/InternalNodeException.kt
@@ -28,7 +28,9 @@ class InternalNodeException(message: String) : CordaRuntimeException(message) {
             (wrapped as? CordaRuntimeException)?.setCause(null)
             return when {
                 whitelisted.any { it.isInstance(wrapped) } -> wrapped
-                else -> InternalNodeException(DEFAULT_MESSAGE)
+                else -> InternalNodeException(DEFAULT_MESSAGE).apply {
+                    stackTrace = emptyArray()
+                }
             }
         }
     }
diff --git a/node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisMessagingClient.kt b/node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisMessagingClient.kt
index 4b1d3ce03a..f61ed121dd 100644
--- a/node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisMessagingClient.kt
+++ b/node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisMessagingClient.kt
@@ -56,6 +56,7 @@ class ArtemisMessagingClient(
             minLargeMessageSize = maxMessageSize
             isUseGlobalPools = nodeSerializationEnv != null
             confirmationWindowSize = this@ArtemisMessagingClient.confirmationWindowSize
+            addIncomingInterceptor(ArtemisMessageSizeChecksInterceptor(maxMessageSize))
         }
         val sessionFactory = locator.createSessionFactory()
         // Login using the node username. The broker will authenticate us as its node (as opposed to another peer)
diff --git a/node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisMessagingComponent.kt b/node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisMessagingComponent.kt
index 606e2e63c6..e9adeb50e3 100644
--- a/node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisMessagingComponent.kt
+++ b/node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisMessagingComponent.kt
@@ -40,7 +40,9 @@ class ArtemisMessagingComponent {
         const val BRIDGE_CONTROL = "${INTERNAL_PREFIX}bridge.control"
         const val BRIDGE_NOTIFY = "${INTERNAL_PREFIX}bridge.notify"
         const val NOTIFICATIONS_ADDRESS = "${INTERNAL_PREFIX}activemq.notifications"
-
+        // This is a rough guess on the extra space needed on top of maxMessageSize to store the journal.
+        // TODO: we might want to make this value configurable.
+        const val JOURNAL_HEADER_SIZE = 1024
         object P2PMessagingHeaders {
             // This is a "property" attached to an Artemis MQ message object, which contains our own notion of "topic".
             // We should probably try to unify our notion of "topic" (really, just a string that identifies an endpoint
diff --git a/node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisUtils.kt b/node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisUtils.kt
index a41fe1dffa..6e358905cd 100644
--- a/node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisUtils.kt
+++ b/node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisUtils.kt
@@ -22,3 +22,7 @@ import java.nio.file.Path
 fun Path.requireOnDefaultFileSystem() {
     require(fileSystem == FileSystems.getDefault()) { "Artemis only uses the default file system" }
 }
+
+fun requireMessageSize(messageSize: Int, limit: Int) {
+    require(messageSize <= limit) { "Message exceeds maxMessageSize network parameter, maxMessageSize: [$limit], message size: [$messageSize]" }
+}
diff --git a/node-api/src/main/kotlin/net/corda/nodeapi/internal/MessageSizeChecksInterceptor.kt b/node-api/src/main/kotlin/net/corda/nodeapi/internal/MessageSizeChecksInterceptor.kt
new file mode 100644
index 0000000000..854ae0109f
--- /dev/null
+++ b/node-api/src/main/kotlin/net/corda/nodeapi/internal/MessageSizeChecksInterceptor.kt
@@ -0,0 +1,50 @@
+package net.corda.nodeapi.internal
+
+import net.corda.core.utilities.contextLogger
+import org.apache.activemq.artemis.api.core.BaseInterceptor
+import org.apache.activemq.artemis.api.core.Interceptor
+import org.apache.activemq.artemis.core.protocol.core.Packet
+import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.MessagePacket
+import org.apache.activemq.artemis.protocol.amqp.broker.AMQPMessage
+import org.apache.activemq.artemis.protocol.amqp.broker.AmqpInterceptor
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection
+
+class ArtemisMessageSizeChecksInterceptor(maxMessageSize: Int) : MessageSizeChecksInterceptor<Packet>(maxMessageSize), Interceptor {
+    override fun getMessageSize(packet: Packet?): Int? {
+        return when (packet) {
+        // This is an estimate of how much memory a Message body takes up.
+        // Note, it is only an estimate
+            is MessagePacket -> (packet.message.persistentSize - packet.message.headersAndPropertiesEncodeSize - 4).toInt()
+        // Skip all artemis control messages.
+            else -> null
+        }
+    }
+}
+
+class AmqpMessageSizeChecksInterceptor(maxMessageSize: Int) : MessageSizeChecksInterceptor<AMQPMessage>(maxMessageSize), AmqpInterceptor {
+    override fun getMessageSize(packet: AMQPMessage?): Int? = packet?.length
+}
+
+/**
+ *  Artemis message interceptor to enforce maxMessageSize on incoming messages.
+ */
+sealed class MessageSizeChecksInterceptor<T : Any>(private val maxMessageSize: Int) : BaseInterceptor<T> {
+    companion object {
+        private val logger = contextLogger()
+    }
+
+    override fun intercept(packet: T, connection: RemotingConnection?): Boolean {
+        val messageSize = getMessageSize(packet) ?: return true
+        return if (messageSize > maxMessageSize) {
+            logger.warn("Message size exceeds maxMessageSize network parameter, maxMessageSize: [$maxMessageSize], message size: [$messageSize], " +
+                    "dropping message, client id :${connection?.clientID}")
+            false
+        } else {
+            true
+        }
+    }
+
+    // get size of the message in byte, returns null if the message is null or size don't need to be checked.
+    abstract fun getMessageSize(packet: T?): Int?
+}
+
diff --git a/node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/AMQPBridgeManager.kt b/node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/AMQPBridgeManager.kt
index 88ce5a2442..80a4190f9c 100644
--- a/node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/AMQPBridgeManager.kt
+++ b/node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/AMQPBridgeManager.kt
@@ -48,7 +48,8 @@ import kotlin.concurrent.withLock
  *  The Netty thread pool used by the AMQPBridges is also shared and managed by the AMQPBridgeManager.
  */
 @VisibleForTesting
-class AMQPBridgeManager(config: NodeSSLConfiguration, private val socksProxyConfig: SocksProxyConfig? = null, private val artemisMessageClientFactory: () -> ArtemisSessionProvider) : BridgeManager {
+class AMQPBridgeManager(config: NodeSSLConfiguration, private val socksProxyConfig: SocksProxyConfig? = null,
+                        private val maxMessageSize: Int, private val artemisMessageClientFactory: () -> ArtemisSessionProvider) : BridgeManager {
 
     private val lock = ReentrantLock()
     private val bridgeNameToBridgeMap = mutableMapOf<String, AMQPBridge>()
@@ -59,7 +60,8 @@ class AMQPBridgeManager(config: NodeSSLConfiguration, private val socksProxyConf
     private var artemis: ArtemisSessionProvider? = null
     private val crlCheckSoftFail: Boolean = config.crlCheckSoftFail
 
-    constructor(config: NodeSSLConfiguration, p2pAddress: NetworkHostAndPort, maxMessageSize: Int, socksProxyConfig: SocksProxyConfig? = null) : this(config, socksProxyConfig, { ArtemisMessagingClient(config, p2pAddress, maxMessageSize) })
+    constructor(config: NodeSSLConfiguration, p2pAddress: NetworkHostAndPort, maxMessageSize: Int, socksProxyConfig: SocksProxyConfig? = null) : this(config, socksProxyConfig, maxMessageSize, { ArtemisMessagingClient(config, p2pAddress, maxMessageSize) })
+
 
     companion object {
         private const val NUM_BRIDGE_THREADS = 0 // Default sized pool
@@ -82,14 +84,16 @@ class AMQPBridgeManager(config: NodeSSLConfiguration, private val socksProxyConf
                              crlCheckSoftFail: Boolean,
                              sharedEventGroup: EventLoopGroup,
                              socksProxyConfig: SocksProxyConfig?,
-                             private val artemis: ArtemisSessionProvider) {
+                             private val artemis: ArtemisSessionProvider,
+                             private val maxMessageSize: Int) {
         companion object {
             fun getBridgeName(queueName: String, hostAndPort: NetworkHostAndPort): String = "$queueName -> $hostAndPort"
         }
 
         private val log = LoggerFactory.getLogger("$bridgeName:${legalNames.first()}")
 
-        val amqpClient = AMQPClient(listOf(target), legalNames, PEER_USER, PEER_USER, keyStore, keyStorePrivateKeyPassword, trustStore, crlCheckSoftFail, sharedThreadPool = sharedEventGroup, socksProxyConfig = socksProxyConfig)
+        val amqpClient = AMQPClient(listOf(target), legalNames, PEER_USER, PEER_USER, keyStore, keyStorePrivateKeyPassword, trustStore, crlCheckSoftFail,
+                sharedThreadPool = sharedEventGroup, socksProxyConfig = socksProxyConfig, maxMessageSize = maxMessageSize)
         val bridgeName: String get() = getBridgeName(queueName, target)
         private val lock = ReentrantLock() // lock to serialise session level access
         private var session: ClientSession? = null
@@ -141,6 +145,13 @@ class AMQPBridgeManager(config: NodeSSLConfiguration, private val socksProxyConf
         }
 
         private fun clientArtemisMessageHandler(artemisMessage: ClientMessage) {
+            if (artemisMessage.bodySize > maxMessageSize) {
+                log.warn("Message exceeds maxMessageSize network parameter, maxMessageSize: [$maxMessageSize], message size: [${artemisMessage.bodySize}], " +
+                        "dropping message, uuid: ${artemisMessage.getObjectProperty("_AMQ_DUPL_ID")}")
+                // Ack the message to prevent same message being sent to us again.
+                artemisMessage.acknowledge()
+                return
+            }
             val data = ByteArray(artemisMessage.bodySize).apply { artemisMessage.bodyBuffer.readBytes(this) }
             val properties = HashMap<String, Any?>()
             for (key in P2PMessagingHeaders.whitelistedHeaders) {
@@ -183,7 +194,9 @@ class AMQPBridgeManager(config: NodeSSLConfiguration, private val socksProxyConf
         if (bridgeExists(getBridgeName(queueName, target))) {
             return
         }
-        val newBridge = AMQPBridge(queueName, target, legalNames, keyStore, keyStorePrivateKeyPassword, trustStore, crlCheckSoftFail, sharedEventLoopGroup!!, socksProxyConfig, artemis!!)
+
+        val newBridge = AMQPBridge(queueName, target, legalNames, keyStore, keyStorePrivateKeyPassword, trustStore, crlCheckSoftFail, sharedEventLoopGroup!!, socksProxyConfig, artemis!!, maxMessageSize)
+
         lock.withLock {
             bridgeNameToBridgeMap[newBridge.bridgeName] = newBridge
         }
diff --git a/node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/BridgeControlListener.kt b/node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/BridgeControlListener.kt
index f11ac07c0d..6d49eee754 100644
--- a/node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/BridgeControlListener.kt
+++ b/node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/BridgeControlListener.kt
@@ -33,19 +33,24 @@ import rx.subjects.PublishSubject
 import java.util.*
 
 class BridgeControlListener(val config: NodeSSLConfiguration,
+
                             socksProxyConfig: SocksProxyConfig? = null,
+                            maxMessageSize: Int,
                             val artemisMessageClientFactory: () -> ArtemisSessionProvider) : AutoCloseable {
     private val bridgeId: String = UUID.randomUUID().toString()
     private val bridgeControlQueue = "$BRIDGE_CONTROL.$bridgeId"
-    private val bridgeManager: BridgeManager = AMQPBridgeManager(config, socksProxyConfig, artemisMessageClientFactory)
+    private val bridgeManager: BridgeManager = AMQPBridgeManager(config, socksProxyConfig, maxMessageSize,
+            artemisMessageClientFactory)
     private val validInboundQueues = mutableSetOf<String>()
     private var artemis: ArtemisSessionProvider? = null
     private var controlConsumer: ClientConsumer? = null
 
     constructor(config: NodeSSLConfiguration,
                 p2pAddress: NetworkHostAndPort,
+
                 maxMessageSize: Int,
-                socksProxy: SocksProxyConfig? = null) : this(config, socksProxy, { ArtemisMessagingClient(config, p2pAddress, maxMessageSize) })
+                socksProxy: SocksProxyConfig? = null) : this(config, socksProxy, maxMessageSize, { ArtemisMessagingClient(config, p2pAddress, maxMessageSize) })
+
 
     companion object {
         private val log = contextLogger()
diff --git a/node-api/src/main/kotlin/net/corda/nodeapi/internal/network/NetworkBootstrapper.kt b/node-api/src/main/kotlin/net/corda/nodeapi/internal/network/NetworkBootstrapper.kt
index 5b35321a3b..9abcdb657a 100644
--- a/node-api/src/main/kotlin/net/corda/nodeapi/internal/network/NetworkBootstrapper.kt
+++ b/node-api/src/main/kotlin/net/corda/nodeapi/internal/network/NetworkBootstrapper.kt
@@ -33,10 +33,11 @@ import net.corda.nodeapi.internal.ContractsJarFile
 import net.corda.nodeapi.internal.DEV_ROOT_CA
 import net.corda.nodeapi.internal.SignedNodeInfo
 import net.corda.nodeapi.internal.network.NodeInfoFilesCopier.Companion.NODE_INFO_FILE_NAME_PREFIX
-import net.corda.nodeapi.internal.serialization.AMQP_P2P_CONTEXT
 import net.corda.nodeapi.internal.serialization.CordaSerializationMagic
+import net.corda.nodeapi.internal.serialization.AMQP_P2P_CONTEXT
 import net.corda.nodeapi.internal.serialization.SerializationFactoryImpl
-import net.corda.nodeapi.internal.serialization.amqp.AMQPServerSerializationScheme
+import net.corda.nodeapi.internal.serialization.amqp.AbstractAMQPSerializationScheme
+import net.corda.nodeapi.internal.serialization.amqp.amqpMagic
 import net.corda.nodeapi.internal.serialization.kryo.AbstractKryoSerializationScheme
 import net.corda.nodeapi.internal.serialization.kryo.kryoMagic
 import java.nio.file.Path
@@ -288,7 +289,7 @@ class NetworkBootstrapper {
         _contextSerializationEnv.set(SerializationEnvironmentImpl(
                 SerializationFactoryImpl().apply {
                     registerScheme(KryoParametersSerializationScheme)
-                    registerScheme(AMQPServerSerializationScheme())
+                    registerScheme(AMQPParametersSerializationScheme)
                 },
                 AMQP_P2P_CONTEXT)
         )
@@ -302,4 +303,13 @@ class NetworkBootstrapper {
         override fun rpcClientKryoPool(context: SerializationContext) = throw UnsupportedOperationException()
         override fun rpcServerKryoPool(context: SerializationContext) = throw UnsupportedOperationException()
     }
+
+    private object AMQPParametersSerializationScheme : AbstractAMQPSerializationScheme(emptyList()) {
+        override fun rpcClientSerializerFactory(context: SerializationContext) = throw UnsupportedOperationException()
+        override fun rpcServerSerializerFactory(context: SerializationContext) = throw UnsupportedOperationException()
+
+        override fun canDeserializeVersion(magic: CordaSerializationMagic, target: SerializationContext.UseCase): Boolean {
+            return magic == amqpMagic && target == SerializationContext.UseCase.P2P
+        }
+    }
 }
diff --git a/node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/engine/ConnectionStateMachine.kt b/node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/engine/ConnectionStateMachine.kt
index 6f1ca23897..77f64fc002 100644
--- a/node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/engine/ConnectionStateMachine.kt
+++ b/node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/engine/ConnectionStateMachine.kt
@@ -362,7 +362,7 @@ internal class ConnectionStateMachine(serverMode: Boolean,
                 val connection = event.connection
                 val channel = connection?.context as? Channel
                 if (channel != null) {
-                    val appProperties = HashMap(amqpMessage.applicationProperties.value as Map<String, Any?>)
+                    val appProperties = HashMap(amqpMessage.applicationProperties.value)
                     appProperties["_AMQ_VALIDATED_USER"] = remoteLegalName
                     val localAddress = channel.localAddress() as InetSocketAddress
                     val remoteAddress = channel.remoteAddress() as InetSocketAddress
diff --git a/node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPClient.kt b/node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPClient.kt
index 14fcfb9a6d..01f05532c5 100644
--- a/node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPClient.kt
+++ b/node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPClient.kt
@@ -27,6 +27,7 @@ import net.corda.core.utilities.contextLogger
 import net.corda.nodeapi.internal.protonwrapper.messages.ReceivedMessage
 import net.corda.nodeapi.internal.protonwrapper.messages.SendableMessage
 import net.corda.nodeapi.internal.protonwrapper.messages.impl.SendableMessageImpl
+import net.corda.nodeapi.internal.requireMessageSize
 import rx.Observable
 import rx.subjects.PublishSubject
 import java.net.InetSocketAddress
@@ -68,7 +69,8 @@ class AMQPClient(val targets: List<NetworkHostAndPort>,
                  private val crlCheckSoftFail: Boolean,
                  private val trace: Boolean = false,
                  private val sharedThreadPool: EventLoopGroup? = null,
-                 private val socksProxyConfig: SocksProxyConfig? = null) : AutoCloseable {
+                 private val socksProxyConfig: SocksProxyConfig? = null,
+                 private val maxMessageSize: Int) : AutoCloseable {
     companion object {
         init {
             InternalLoggerFactory.setDefaultFactory(Slf4JLoggerFactory.INSTANCE)
@@ -118,17 +120,15 @@ class AMQPClient(val targets: List<NetworkHostAndPort>,
         }
     }
 
-    private val closeListener = object : ChannelFutureListener {
-        override fun operationComplete(future: ChannelFuture) {
-            log.info("Disconnected from $currentTarget")
-            future.channel()?.disconnect()
-            clientChannel = null
-            if (!stopping) {
-                workerGroup?.schedule({
-                    nextTarget()
-                    restart()
-                }, retryInterval, TimeUnit.MILLISECONDS)
-            }
+    private val closeListener = ChannelFutureListener { future ->
+        log.info("Disconnected from $currentTarget")
+        future.channel()?.disconnect()
+        clientChannel = null
+        if (!stopping) {
+            workerGroup?.schedule({
+                nextTarget()
+                restart()
+            }, retryInterval, TimeUnit.MILLISECONDS)
         }
     }
 
@@ -228,6 +228,7 @@ class AMQPClient(val targets: List<NetworkHostAndPort>,
                       topic: String,
                       destinationLegalName: String,
                       properties: Map<String, Any?>): SendableMessage {
+        requireMessageSize(payload.size, maxMessageSize)
         return SendableMessageImpl(payload, topic, destinationLegalName, currentTarget, properties)
     }
 
diff --git a/node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPServer.kt b/node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPServer.kt
index ef2aae5c47..d2203a5306 100644
--- a/node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPServer.kt
+++ b/node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPServer.kt
@@ -27,6 +27,7 @@ import net.corda.core.utilities.contextLogger
 import net.corda.nodeapi.internal.protonwrapper.messages.ReceivedMessage
 import net.corda.nodeapi.internal.protonwrapper.messages.SendableMessage
 import net.corda.nodeapi.internal.protonwrapper.messages.impl.SendableMessageImpl
+import net.corda.nodeapi.internal.requireMessageSize
 import org.apache.qpid.proton.engine.Delivery
 import rx.Observable
 import rx.subjects.PublishSubject
@@ -51,7 +52,8 @@ class AMQPServer(val hostName: String,
                  private val keyStorePrivateKeyPassword: CharArray,
                  private val trustStore: KeyStore,
                  private val crlCheckSoftFail: Boolean,
-                 private val trace: Boolean = false) : AutoCloseable {
+                 private val trace: Boolean = false,
+                 private val maxMessageSize: Int) : AutoCloseable {
 
     companion object {
         init {
@@ -78,7 +80,8 @@ class AMQPServer(val hostName: String,
                 keyStorePrivateKeyPassword: String,
                 trustStore: KeyStore,
                 crlCheckSoftFail: Boolean,
-                trace: Boolean = false) : this(hostName, port, userName, password, keyStore, keyStorePrivateKeyPassword.toCharArray(), trustStore, crlCheckSoftFail, trace)
+                trace: Boolean = false,
+                maxMessageSize: Int) : this(hostName, port, userName, password, keyStore, keyStorePrivateKeyPassword.toCharArray(), trustStore, crlCheckSoftFail, trace, maxMessageSize)
 
     private class ServerChannelInitializer(val parent: AMQPServer) : ChannelInitializer<SocketChannel>() {
         private val keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm())
@@ -166,6 +169,7 @@ class AMQPServer(val hostName: String,
                       destinationLegalName: String,
                       destinationLink: NetworkHostAndPort,
                       properties: Map<String, Any?>): SendableMessage {
+        requireMessageSize(payload.size, maxMessageSize)
         val dest = InetSocketAddress(destinationLink.host, destinationLink.port)
         require(dest in clientChannels.keys) {
             "Destination not available"
diff --git a/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/ClientContexts.kt b/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/ClientContexts.kt
index c6569f86c8..d592e96be1 100644
--- a/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/ClientContexts.kt
+++ b/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/ClientContexts.kt
@@ -23,13 +23,7 @@ import net.corda.nodeapi.internal.serialization.kryo.kryoMagic
  * servers from trying to instantiate any of them.
  */
 
-val KRYO_RPC_CLIENT_CONTEXT = SerializationContextImpl(kryoMagic,
-        SerializationDefaults.javaClass.classLoader,
-        GlobalTransientClassWhiteList(BuiltInExceptionsWhitelist()),
-        emptyMap(),
-        true,
-        SerializationContext.UseCase.RPCClient,
-        null)
+
 val AMQP_RPC_CLIENT_CONTEXT = SerializationContextImpl(amqpMagic,
         SerializationDefaults.javaClass.classLoader,
         GlobalTransientClassWhiteList(BuiltInExceptionsWhitelist()),
diff --git a/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/SerializationScheme.kt b/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/SerializationScheme.kt
index 2514b93652..b2805b8fed 100644
--- a/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/SerializationScheme.kt
+++ b/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/SerializationScheme.kt
@@ -124,8 +124,9 @@ open class SerializationFactoryImpl(
         val lookupKey = magic to target
         return schemes.computeIfAbsent(lookupKey) {
             registeredSchemes.filter { it.canDeserializeVersion(magic, target) }.forEach { return@computeIfAbsent it } // XXX: Not single?
-            logger.warn("Cannot find serialization scheme for: $lookupKey, registeredSchemes are: $registeredSchemes")
-            throw UnsupportedOperationException("Serialization scheme not supported.")
+            logger.warn("Cannot find serialization scheme for: [$lookupKey, " +
+                    "${if (magic == amqpMagic) "AMQP" else if (magic == kryoMagic) "Kryo" else "UNKNOWN MAGIC"}] registeredSchemes are: $registeredSchemes")
+            throw UnsupportedOperationException("Serialization scheme $lookupKey not supported.")
         } to magic
     }
 
diff --git a/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/ServerContexts.kt b/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/ServerContexts.kt
index b76e755e13..471e36a656 100644
--- a/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/ServerContexts.kt
+++ b/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/ServerContexts.kt
@@ -27,13 +27,6 @@ import net.corda.nodeapi.internal.serialization.kryo.kryoMagic
  * MUST be kept separate!
  */
 
-val KRYO_RPC_SERVER_CONTEXT = SerializationContextImpl(kryoMagic,
-        SerializationDefaults.javaClass.classLoader,
-        GlobalTransientClassWhiteList(BuiltInExceptionsWhitelist()),
-        emptyMap(),
-        true,
-        SerializationContext.UseCase.RPCServer,
-        null)
 
 val AMQP_STORAGE_CONTEXT = SerializationContextImpl(amqpMagic,
         SerializationDefaults.javaClass.classLoader,
diff --git a/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/AMQPSerializationScheme.kt b/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/AMQPSerializationScheme.kt
index 27bb08bc38..620ba2576a 100644
--- a/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/AMQPSerializationScheme.kt
+++ b/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/AMQPSerializationScheme.kt
@@ -15,6 +15,7 @@ package net.corda.nodeapi.internal.serialization.amqp
 import io.github.lukehutch.fastclasspathscanner.FastClasspathScanner
 import net.corda.core.cordapp.Cordapp
 import net.corda.core.internal.objectOrNewInstance
+import net.corda.core.internal.uncheckedCast
 import net.corda.core.serialization.*
 import net.corda.core.utilities.ByteSequence
 import net.corda.nodeapi.internal.serialization.CordaSerializationMagic
@@ -22,7 +23,6 @@ import net.corda.nodeapi.internal.serialization.DefaultWhitelist
 import net.corda.nodeapi.internal.serialization.MutableClassWhitelist
 import net.corda.nodeapi.internal.serialization.SerializationScheme
 import java.lang.reflect.Modifier
-import java.security.PublicKey
 import java.util.*
 import java.util.concurrent.ConcurrentHashMap
 
@@ -128,6 +128,12 @@ abstract class AbstractAMQPSerializationScheme(
                 factory.registerExternal(CorDappCustomSerializer(customSerializer, factory))
             }
         }
+
+        context.properties[ContextPropertyKeys.SERIALIZERS]?.apply {
+            uncheckedCast<Any, List<CustomSerializer<out Any>>>(this).forEach {
+                factory.register(it)
+            }
+        }
     }
 
     /*
@@ -141,7 +147,9 @@ abstract class AbstractAMQPSerializationScheme(
 
     protected abstract fun rpcClientSerializerFactory(context: SerializationContext): SerializerFactory
     protected abstract fun rpcServerSerializerFactory(context: SerializationContext): SerializerFactory
-    protected open val publicKeySerializer: CustomSerializer.Implements<PublicKey> = net.corda.nodeapi.internal.serialization.amqp.custom.PublicKeySerializer
+
+    // Not used as a simple direct import to facilitate testing
+    open val publicKeySerializer : CustomSerializer<*> = net.corda.nodeapi.internal.serialization.amqp.custom.PublicKeySerializer
 
     private fun getSerializerFactory(context: SerializationContext): SerializerFactory {
         return serializerFactoriesForContexts.computeIfAbsent(Pair(context.whitelist, context.deserializationClassLoader)) {
@@ -172,52 +180,3 @@ abstract class AbstractAMQPSerializationScheme(
 
     protected fun canDeserializeVersion(magic: CordaSerializationMagic) = magic == amqpMagic
 }
-
-// TODO: This will eventually cover server RPC as well and move to node module, but for now this is not implemented
-class AMQPServerSerializationScheme(
-    cordappCustomSerializers: Set<SerializationCustomSerializer<*, *>>,
-    serializerFactoriesForContexts: MutableMap<Pair<ClassWhitelist, ClassLoader>, SerializerFactory>
-) : AbstractAMQPSerializationScheme(cordappCustomSerializers, serializerFactoriesForContexts) {
-    constructor(cordapps: List<Cordapp>) : this(cordapps.customSerializers, ConcurrentHashMap())
-
-    constructor() : this(emptySet(), ConcurrentHashMap())
-
-    override fun rpcClientSerializerFactory(context: SerializationContext): SerializerFactory {
-        throw UnsupportedOperationException()
-    }
-
-    override fun rpcServerSerializerFactory(context: SerializationContext): SerializerFactory {
-        throw UnsupportedOperationException()
-    }
-
-    override fun canDeserializeVersion(magic: CordaSerializationMagic, target: SerializationContext.UseCase): Boolean {
-        return canDeserializeVersion(magic) &&
-                (target == SerializationContext.UseCase.P2P || target == SerializationContext.UseCase.Storage)
-    }
-
-}
-
-// TODO: This will eventually cover client RPC as well and move to client module, but for now this is not implemented
-class AMQPClientSerializationScheme(
-    cordappCustomSerializers: Set<SerializationCustomSerializer<*,*>>,
-    serializerFactoriesForContexts: MutableMap<Pair<ClassWhitelist, ClassLoader>, SerializerFactory>
-) : AbstractAMQPSerializationScheme(cordappCustomSerializers, serializerFactoriesForContexts) {
-    constructor(cordapps: List<Cordapp>) : this(cordapps.customSerializers, ConcurrentHashMap())
-
-    constructor() : this(emptySet(), ConcurrentHashMap())
-
-    override fun rpcClientSerializerFactory(context: SerializationContext): SerializerFactory {
-        throw UnsupportedOperationException()
-    }
-
-    override fun rpcServerSerializerFactory(context: SerializationContext): SerializerFactory {
-        throw UnsupportedOperationException()
-    }
-
-    override fun canDeserializeVersion(magic: CordaSerializationMagic, target: SerializationContext.UseCase): Boolean {
-        return canDeserializeVersion(magic) &&
-                (target == SerializationContext.UseCase.P2P || target == SerializationContext.UseCase.Storage)
-    }
-
-}
-
diff --git a/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/SerializerFactory.kt b/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/SerializerFactory.kt
index b0eb38e94e..c6dcf29eed 100644
--- a/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/SerializerFactory.kt
+++ b/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/SerializerFactory.kt
@@ -295,7 +295,11 @@ open class SerializerFactory(
     }
 
     private fun makeClassSerializer(clazz: Class<*>, type: Type, declaredType: Type): AMQPSerializer<Any> = serializersByType.computeIfAbsent(type) {
-        if (isPrimitive(clazz)) {
+        if (clazz.isSynthetic) {
+            // Explicitly ban synthetic classes, we have no way of recreating them when deserializing. This also
+            // captures Lambda expressions and other anonymous functions
+            throw NotSerializableException(type.typeName)
+        } else if (isPrimitive(clazz)) {
             AMQPPrimitiveSerializer(clazz)
         } else {
             findCustomSerializer(clazz, declaredType) ?: run {
diff --git a/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/custom/ClassSerializer.kt b/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/custom/ClassSerializer.kt
index 378b3580c9..d844af4d9c 100644
--- a/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/custom/ClassSerializer.kt
+++ b/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/custom/ClassSerializer.kt
@@ -12,7 +12,6 @@ package net.corda.nodeapi.internal.serialization.amqp.custom
 
 import net.corda.nodeapi.internal.serialization.amqp.CustomSerializer
 import net.corda.nodeapi.internal.serialization.amqp.SerializerFactory
-import net.corda.nodeapi.internal.serialization.amqp.custom.ClassSerializer.ClassProxy
 
 /**
  * A serializer for [Class] that uses [ClassProxy] proxy object to write out
diff --git a/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/custom/InputStreamSerializer.kt b/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/custom/InputStreamSerializer.kt
index 7a12a2fac1..81359bbf43 100644
--- a/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/custom/InputStreamSerializer.kt
+++ b/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/custom/InputStreamSerializer.kt
@@ -49,7 +49,7 @@ object InputStreamSerializer : CustomSerializer.Implements<InputStream>(InputStr
 
     override fun readObject(obj: Any, schemas: SerializationSchemas, input: DeserializationInput,
                             context: SerializationContext
-    ): InputStream {
+    ) : InputStream {
         val bits = input.readObject(obj, schemas, ByteArray::class.java, context) as ByteArray
         return bits.inputStream()
     }
diff --git a/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/custom/RxNotificationSerializer.kt b/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/custom/RxNotificationSerializer.kt
new file mode 100644
index 0000000000..07dcd561a8
--- /dev/null
+++ b/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/custom/RxNotificationSerializer.kt
@@ -0,0 +1,28 @@
+package net.corda.nodeapi.internal.serialization.amqp.custom
+
+import net.corda.nodeapi.internal.serialization.amqp.CustomSerializer
+import net.corda.nodeapi.internal.serialization.amqp.SerializerFactory
+import rx.Notification
+
+class RxNotificationSerializer(
+        factory: SerializerFactory
+) : CustomSerializer.Proxy<rx.Notification<*>, RxNotificationSerializer.Proxy>(
+        Notification::class.java,
+        Proxy::class.java,
+        factory
+) {
+    data class Proxy(
+            val kind: Notification.Kind,
+            val t: Throwable?,
+            val value: Any?)
+
+    override fun toProxy(obj: Notification<*>) = Proxy(obj.kind, obj.throwable, obj.value)
+
+    override fun fromProxy(proxy: Proxy): Notification<*> {
+        return when (proxy.kind) {
+            Notification.Kind.OnCompleted -> Notification.createOnCompleted<Any>()
+            Notification.Kind.OnError -> Notification.createOnError<Any>(proxy.t)
+            Notification.Kind.OnNext -> Notification.createOnNext(proxy.value)
+        }
+    }
+}
\ No newline at end of file
diff --git a/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/kryo/Kryo.kt b/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/kryo/Kryo.kt
index 3695c3bdca..1a6cd2a5a5 100644
--- a/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/kryo/Kryo.kt
+++ b/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/kryo/Kryo.kt
@@ -17,7 +17,6 @@ import com.esotericsoftware.kryo.io.Output
 import com.esotericsoftware.kryo.serializers.CompatibleFieldSerializer
 import com.esotericsoftware.kryo.serializers.FieldSerializer
 import com.esotericsoftware.kryo.util.MapReferenceResolver
-import net.corda.core.concurrent.CordaFuture
 import net.corda.core.contracts.PrivacySalt
 import net.corda.core.crypto.Crypto
 import net.corda.core.crypto.SecureHash
@@ -28,8 +27,6 @@ import net.corda.core.serialization.SerializationContext.UseCase.Checkpoint
 import net.corda.core.serialization.SerializationContext.UseCase.Storage
 import net.corda.core.serialization.SerializeAsTokenContext
 import net.corda.core.serialization.SerializedBytes
-import net.corda.core.toFuture
-import net.corda.core.toObservable
 import net.corda.core.transactions.*
 import net.corda.core.utilities.OpaqueBytes
 import net.corda.nodeapi.internal.crypto.X509CertificateFactory
@@ -38,7 +35,6 @@ import net.corda.nodeapi.internal.serialization.CordaClassResolver
 import net.corda.nodeapi.internal.serialization.serializationContextKey
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
-import rx.Observable
 import java.io.InputStream
 import java.lang.reflect.InvocationTargetException
 import java.security.PrivateKey
@@ -57,39 +53,16 @@ import kotlin.reflect.jvm.isAccessible
 import kotlin.reflect.jvm.javaType
 
 /**
- * Serialization utilities, using the Kryo framework with a custom serialiser for immutable data classes and a dead
- * simple, totally non-extensible binary (sub)format.
- *
- * This is NOT what should be used in any final platform product, rather, the final state should be a precisely
- * specified and standardised binary format with attention paid to anti-malleability, versioning and performance.
- * FIX SBE is a potential candidate: it prioritises performance over convenience and was designed for HFT. Google
- * Protocol Buffers with a minor tightening to make field reordering illegal is another possibility.
- *
- * FIX SBE:
- *     https://real-logic.github.io/simple-binary-encoding/
- *     http://mechanical-sympathy.blogspot.co.at/2014/05/simple-binary-encoding.html
- * Protocol buffers:
- *     https://developers.google.com/protocol-buffers/
- *
- * But for now we use Kryo to maximise prototyping speed.
- *
- * Note that this code ignores *ALL* concerns beyond convenience, in particular it ignores:
- *
- * - Performance
- * - Security
- *
- * This code will happily deserialise literally anything, including malicious streams that would reconstruct classes
- * in invalid states, thus violating system invariants. It isn't designed to handle malicious streams and therefore,
- * isn't usable beyond the prototyping stage. But that's fine: we can revisit serialisation technologies later after
- * a formal evaluation process.
- *
- * We now distinguish between internal, storage related Kryo and external, network facing Kryo.  We presently use
- * some non-whitelisted classes as part of internal storage.
- * TODO: eliminate internal, storage related whitelist issues, such as private keys in blob storage.
+ * Serialization utilities, using the Kryo framework with a custom serializer for immutable data classes and a dead
+ * simple, totally non-extensible binary (sub)format. Used exclusively within Corda for checkpointing flows as
+ * it will happily deserialise literally anything, including malicious streams that would reconstruct classes
+ * in invalid states and thus violating system invariants. In the context of checkpointing a Java stack, this is
+ * absolutely the functionality we desire, for a stable binary wire format and persistence technology, we have
+ * the AMQP implementation.
  */
 
 /**
- * A serialiser that avoids writing the wrapper class to the byte stream, thus ensuring [SerializedBytes] is a pure
+ * A serializer that avoids writing the wrapper class to the byte stream, thus ensuring [SerializedBytes] is a pure
  * type safety hack.
  */
 object SerializedBytesSerializer : Serializer<SerializedBytes<Any>>() {
@@ -405,44 +378,6 @@ open class CordaKryo(classResolver: ClassResolver) : Kryo(classResolver, MapRefe
     }
 }
 
-/**
- * The Kryo used for the RPC wire protocol.
- */
-// Every type in the wire protocol is listed here explicitly.
-// This is annoying to write out, but will make it easier to formalise the wire protocol when the time comes,
-// because we can see everything we're using in one place.
-class RPCKryo(observableSerializer: Serializer<Observable<*>>, serializationContext: SerializationContext) : CordaKryo(CordaClassResolver(serializationContext)) {
-    init {
-        DefaultKryoCustomizer.customize(this)
-
-        // RPC specific classes
-        register(InputStream::class.java, InputStreamSerializer)
-        register(Observable::class.java, observableSerializer)
-        register(CordaFuture::class,
-                read = { kryo, input -> observableSerializer.read(kryo, input, Observable::class.java).toFuture() },
-                write = { kryo, output, obj -> observableSerializer.write(kryo, output, obj.toObservable()) }
-        )
-    }
-
-    override fun getRegistration(type: Class<*>): Registration {
-        if (Observable::class.java != type && Observable::class.java.isAssignableFrom(type)) {
-            return super.getRegistration(Observable::class.java)
-        }
-        if (InputStream::class.java != type && InputStream::class.java.isAssignableFrom(type)) {
-            return super.getRegistration(InputStream::class.java)
-        }
-        if (CordaFuture::class.java != type && CordaFuture::class.java.isAssignableFrom(type)) {
-            return super.getRegistration(CordaFuture::class.java)
-        }
-        type.requireExternal("RPC not allowed to deserialise internal classes")
-        return super.getRegistration(type)
-    }
-
-    private fun Class<*>.requireExternal(msg: String) {
-        require(!name.startsWith("net.corda.node.") && ".internal" !in name) { "$msg: $name" }
-    }
-}
-
 inline fun <T : Any> Kryo.register(
         type: KClass<T>,
         crossinline read: (Kryo, Input) -> T,
diff --git a/node-api/src/test/java/net/corda/nodeapi/internal/serialization/ForbiddenLambdaSerializationTests.java b/node-api/src/test/java/net/corda/nodeapi/internal/serialization/ForbiddenLambdaSerializationTests.java
index baeee920d8..e754c9fa91 100644
--- a/node-api/src/test/java/net/corda/nodeapi/internal/serialization/ForbiddenLambdaSerializationTests.java
+++ b/node-api/src/test/java/net/corda/nodeapi/internal/serialization/ForbiddenLambdaSerializationTests.java
@@ -14,13 +14,13 @@ import com.google.common.collect.Maps;
 import net.corda.core.serialization.SerializationContext;
 import net.corda.core.serialization.SerializationFactory;
 import net.corda.core.serialization.SerializedBytes;
-import net.corda.nodeapi.internal.serialization.kryo.CordaClosureBlacklistSerializer;
-import net.corda.nodeapi.internal.serialization.kryo.KryoSerializationSchemeKt;
+import net.corda.nodeapi.internal.serialization.amqp.SchemaKt;
 import net.corda.testing.core.SerializationEnvironmentRule;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 
+import java.io.NotSerializableException;
 import java.io.Serializable;
 import java.util.EnumSet;
 import java.util.concurrent.Callable;
@@ -43,20 +43,17 @@ public final class ForbiddenLambdaSerializationTests {
     @Test
     public final void serialization_fails_for_serializable_java_lambdas() {
         contexts.forEach(ctx -> {
-            SerializationContext context = new SerializationContextImpl(KryoSerializationSchemeKt.getKryoMagic(),
+            SerializationContext context = new SerializationContextImpl(SchemaKt.getAmqpMagic(),
                     this.getClass().getClassLoader(), AllWhitelist.INSTANCE, Maps.newHashMap(), true, ctx, null);
             String value = "Hey";
             Callable<String> target = (Callable<String> & Serializable) () -> value;
 
             Throwable throwable = catchThrowable(() -> serialize(target, context));
 
-            assertThat(throwable).isNotNull();
-            assertThat(throwable).isInstanceOf(IllegalArgumentException.class);
-            if (ctx != SerializationContext.UseCase.RPCServer && ctx != SerializationContext.UseCase.Storage) {
-                assertThat(throwable).hasMessage(CordaClosureBlacklistSerializer.ERROR_MESSAGE);
-            } else {
-                assertThat(throwable).hasMessageContaining("RPC not allowed to deserialise internal classes");
-            }
+            assertThat(throwable)
+                    .isNotNull()
+                    .isInstanceOf(NotSerializableException.class)
+                    .hasMessageContaining(getClass().getName());
         });
     }
 
@@ -64,21 +61,17 @@ public final class ForbiddenLambdaSerializationTests {
     @SuppressWarnings("unchecked")
     public final void serialization_fails_for_not_serializable_java_lambdas() {
         contexts.forEach(ctx -> {
-            SerializationContext context = new SerializationContextImpl(KryoSerializationSchemeKt.getKryoMagic(),
+            SerializationContext context = new SerializationContextImpl(SchemaKt.getAmqpMagic(),
                     this.getClass().getClassLoader(), AllWhitelist.INSTANCE, Maps.newHashMap(), true, ctx, null);
             String value = "Hey";
             Callable<String> target = () -> value;
 
             Throwable throwable = catchThrowable(() -> serialize(target, context));
 
-            assertThat(throwable).isNotNull();
-            assertThat(throwable).isInstanceOf(IllegalArgumentException.class);
-            assertThat(throwable).isInstanceOf(IllegalArgumentException.class);
-            if (ctx != SerializationContext.UseCase.RPCServer && ctx != SerializationContext.UseCase.Storage) {
-                assertThat(throwable).hasMessage(CordaClosureBlacklistSerializer.ERROR_MESSAGE);
-            } else {
-                assertThat(throwable).hasMessageContaining("RPC not allowed to deserialise internal classes");
-            }
+            assertThat(throwable)
+                    .isNotNull()
+                    .isInstanceOf(NotSerializableException.class)
+                    .hasMessageContaining(getClass().getName());
         });
     }
 
diff --git a/node-api/src/test/kotlin/net/corda/nodeapi/internal/crypto/X509UtilitiesTest.kt b/node-api/src/test/kotlin/net/corda/nodeapi/internal/crypto/X509UtilitiesTest.kt
index 1fb12d495c..d912fc2c3a 100644
--- a/node-api/src/test/kotlin/net/corda/nodeapi/internal/crypto/X509UtilitiesTest.kt
+++ b/node-api/src/test/kotlin/net/corda/nodeapi/internal/crypto/X509UtilitiesTest.kt
@@ -18,13 +18,13 @@ import net.corda.core.internal.div
 import net.corda.core.serialization.SerializationContext
 import net.corda.core.serialization.deserialize
 import net.corda.core.serialization.serialize
-import net.corda.node.serialization.kryo.KryoServerSerializationScheme
+import net.corda.node.serialization.amqp.AMQPServerSerializationScheme
 import net.corda.nodeapi.internal.config.SSLConfiguration
 import net.corda.nodeapi.internal.createDevKeyStores
 import net.corda.nodeapi.internal.serialization.AllWhitelist
 import net.corda.nodeapi.internal.serialization.SerializationContextImpl
 import net.corda.nodeapi.internal.serialization.SerializationFactoryImpl
-import net.corda.nodeapi.internal.serialization.kryo.kryoMagic
+import net.corda.nodeapi.internal.serialization.amqp.amqpMagic
 import net.corda.testing.core.ALICE_NAME
 import net.corda.testing.core.BOB_NAME
 import net.corda.testing.core.TestIdentity
@@ -345,8 +345,8 @@ class X509UtilitiesTest {
 
     @Test
     fun `serialize - deserialize X509Certififcate`() {
-        val factory = SerializationFactoryImpl().apply { registerScheme(KryoServerSerializationScheme()) }
-        val context = SerializationContextImpl(kryoMagic,
+        val factory = SerializationFactoryImpl().apply { registerScheme(AMQPServerSerializationScheme()) }
+        val context = SerializationContextImpl(amqpMagic,
                 javaClass.classLoader,
                 AllWhitelist,
                 emptyMap(),
@@ -361,8 +361,8 @@ class X509UtilitiesTest {
 
     @Test
     fun `serialize - deserialize X509CertPath`() {
-        val factory = SerializationFactoryImpl().apply { registerScheme(KryoServerSerializationScheme()) }
-        val context = SerializationContextImpl(kryoMagic,
+        val factory = SerializationFactoryImpl().apply { registerScheme(AMQPServerSerializationScheme()) }
+        val context = SerializationContextImpl(amqpMagic,
                 javaClass.classLoader,
                 AllWhitelist,
                 emptyMap(),
diff --git a/node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/amqp/SerializationOutputTests.kt b/node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/amqp/SerializationOutputTests.kt
index ace26affb0..30dc3fb0d3 100644
--- a/node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/amqp/SerializationOutputTests.kt
+++ b/node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/amqp/SerializationOutputTests.kt
@@ -40,6 +40,7 @@ import net.corda.core.serialization.SerializationContext
 import net.corda.core.serialization.SerializationFactory
 import net.corda.core.transactions.LedgerTransaction
 import net.corda.core.utilities.OpaqueBytes
+import net.corda.node.serialization.amqp.AMQPServerSerializationScheme
 import net.corda.nodeapi.internal.DEV_INTERMEDIATE_CA
 import net.corda.nodeapi.internal.crypto.ContentSignerBuilder
 import net.corda.nodeapi.internal.serialization.AllWhitelist
diff --git a/node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/kryo/KryoTests.kt b/node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/kryo/KryoTests.kt
index e3021df901..7471336b24 100644
--- a/node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/kryo/KryoTests.kt
+++ b/node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/kryo/KryoTests.kt
@@ -15,6 +15,7 @@ import com.esotericsoftware.kryo.KryoException
 import com.esotericsoftware.kryo.KryoSerializable
 import com.esotericsoftware.kryo.io.Input
 import com.esotericsoftware.kryo.io.Output
+import com.esotericsoftware.kryo.pool.KryoPool
 import com.google.common.primitives.Ints
 import com.nhaarman.mockito_kotlin.doReturn
 import com.nhaarman.mockito_kotlin.whenever
@@ -22,9 +23,9 @@ import net.corda.core.contracts.PrivacySalt
 import net.corda.core.crypto.*
 import net.corda.core.internal.FetchDataFlow
 import net.corda.core.serialization.*
+import net.corda.core.utilities.ByteSequence
 import net.corda.core.utilities.ProgressTracker
 import net.corda.core.utilities.sequence
-import net.corda.node.serialization.kryo.KryoServerSerializationScheme
 import net.corda.node.services.persistence.NodeAttachmentService
 import net.corda.nodeapi.internal.serialization.*
 import net.corda.testing.core.ALICE_NAME
@@ -44,6 +45,17 @@ import java.time.Instant
 import java.util.*
 import kotlin.test.*
 
+class TestScheme : AbstractKryoSerializationScheme() {
+    override fun canDeserializeVersion(magic: CordaSerializationMagic, target: SerializationContext.UseCase): Boolean {
+        return magic == kryoMagic && target != SerializationContext.UseCase.RPCClient
+    }
+
+    override fun rpcClientKryoPool(context: SerializationContext): KryoPool = throw UnsupportedOperationException()
+
+    override fun rpcServerKryoPool(context: SerializationContext): KryoPool = throw UnsupportedOperationException()
+
+}
+
 @RunWith(Parameterized::class)
 class KryoTests(private val compression: CordaSerializationEncoding?) {
     companion object {
@@ -58,7 +70,7 @@ class KryoTests(private val compression: CordaSerializationEncoding?) {
 
     @Before
     fun setup() {
-        factory = SerializationFactoryImpl().apply { registerScheme(KryoServerSerializationScheme()) }
+        factory = SerializationFactoryImpl().apply { registerScheme(TestScheme()) }
         context = SerializationContextImpl(kryoMagic,
                 javaClass.classLoader,
                 AllWhitelist,
@@ -86,11 +98,12 @@ class KryoTests(private val compression: CordaSerializationEncoding?) {
         assertThat(bits.deserialize(factory, context)).isEqualTo(Person("bob", null))
     }
 
+
     @Test
     fun `serialised form is stable when the same object instance is added to the deserialised object graph`() {
         val noReferencesContext = context.withoutReferences()
-        val obj = Ints.toByteArray(0x01234567).sequence()
-        val originalList = arrayListOf(obj)
+        val obj : ByteSequence = Ints.toByteArray(0x01234567).sequence()
+        val originalList : ArrayList<ByteSequence> = arrayListOf(obj)
         val deserialisedList = originalList.serialize(factory, noReferencesContext).deserialize(factory, noReferencesContext)
         originalList += obj
         deserialisedList += obj
@@ -278,7 +291,7 @@ class KryoTests(private val compression: CordaSerializationEncoding?) {
             }
         }
         Tmp()
-        val factory = SerializationFactoryImpl().apply { registerScheme(KryoServerSerializationScheme()) }
+        val factory = SerializationFactoryImpl().apply { registerScheme(TestScheme()) }
         val context = SerializationContextImpl(kryoMagic,
                 javaClass.classLoader,
                 AllWhitelist,
diff --git a/node/src/integration-test/kotlin/net/corda/node/BootTests.kt b/node/src/integration-test/kotlin/net/corda/node/BootTests.kt
index 1ada752f6d..c79c3f7b1f 100644
--- a/node/src/integration-test/kotlin/net/corda/node/BootTests.kt
+++ b/node/src/integration-test/kotlin/net/corda/node/BootTests.kt
@@ -12,6 +12,7 @@ package net.corda.node
 
 import co.paralleluniverse.fibers.Suspendable
 import net.corda.client.rpc.CordaRPCClient
+import net.corda.core.CordaRuntimeException
 import net.corda.core.flows.FlowLogic
 import net.corda.core.flows.StartableByRPC
 import net.corda.core.internal.div
@@ -21,6 +22,7 @@ import net.corda.core.messaging.startFlow
 import net.corda.core.utilities.getOrThrow
 import net.corda.node.internal.NodeStartup
 import net.corda.node.services.Permissions.Companion.startFlow
+import net.corda.nodeapi.exceptions.InternalNodeException
 import net.corda.testing.common.internal.ProjectStructure.projectRootDir
 import net.corda.testing.core.ALICE_NAME
 import net.corda.testing.core.BOB_NAME
@@ -51,8 +53,11 @@ class BootTests : IntegrationTest() {
     fun `java deserialization is disabled`() {
         driver {
             val user = User("u", "p", setOf(startFlow<ObjectInputStreamFlow>()))
-            val future = CordaRPCClient(startNode(rpcUsers = listOf(user)).getOrThrow().rpcAddress).start(user.username, user.password).proxy.startFlow(::ObjectInputStreamFlow).returnValue
-            assertThatThrownBy { future.getOrThrow() }.isInstanceOf(InvalidClassException::class.java).hasMessage("filter status: REJECTED")
+            val future = CordaRPCClient(startNode(rpcUsers = listOf(user)).getOrThrow().rpcAddress).
+                    start(user.username, user.password).proxy.startFlow(::ObjectInputStreamFlow).returnValue
+            assertThatThrownBy { future.getOrThrow() }
+                    .isInstanceOf(CordaRuntimeException::class.java)
+                    .hasMessageContaining(InternalNodeException.defaultMessage())
         }
     }
 
diff --git a/node/src/integration-test/kotlin/net/corda/node/amqp/AMQPBridgeTest.kt b/node/src/integration-test/kotlin/net/corda/node/amqp/AMQPBridgeTest.kt
index 5a6b964700..d66d136a12 100644
--- a/node/src/integration-test/kotlin/net/corda/node/amqp/AMQPBridgeTest.kt
+++ b/node/src/integration-test/kotlin/net/corda/node/amqp/AMQPBridgeTest.kt
@@ -272,6 +272,7 @@ class AMQPBridgeTest {
         return Triple(artemisServer, artemisClient, bridgeManager)
     }
 
+
     private fun createArtemisReceiver(targetAdress: NetworkHostAndPort, workingDir: String): Pair<ArtemisMessagingServer, ArtemisMessagingClient> {
         val artemisConfig = rigorousMock<AbstractNodeConfiguration>().also {
             doReturn(temporaryFolder.root.toPath() / workingDir).whenever(it).baseDirectory
@@ -293,8 +294,7 @@ class AMQPBridgeTest {
 
     }
 
-
-    private fun createAMQPServer(): AMQPServer {
+    private fun createAMQPServer(maxMessageSize: Int = MAX_MESSAGE_SIZE): AMQPServer {
         val serverConfig = rigorousMock<AbstractNodeConfiguration>().also {
             doReturn(temporaryFolder.root.toPath() / "server").whenever(it).baseDirectory
             doReturn(BOB_NAME).whenever(it).myLegalName
@@ -311,7 +311,8 @@ class AMQPBridgeTest {
                 serverConfig.keyStorePassword,
                 serverConfig.loadTrustStore().internal,
                 crlCheckSoftFail = true,
-                trace = true
+                trace = true,
+                maxMessageSize = maxMessageSize
         )
     }
 }
\ No newline at end of file
diff --git a/node/src/integration-test/kotlin/net/corda/node/amqp/CertificateRevocationListNodeTests.kt b/node/src/integration-test/kotlin/net/corda/node/amqp/CertificateRevocationListNodeTests.kt
index dd8240c822..4e709fd91c 100644
--- a/node/src/integration-test/kotlin/net/corda/node/amqp/CertificateRevocationListNodeTests.kt
+++ b/node/src/integration-test/kotlin/net/corda/node/amqp/CertificateRevocationListNodeTests.kt
@@ -19,10 +19,7 @@ import net.corda.nodeapi.internal.crypto.*
 import net.corda.nodeapi.internal.protonwrapper.messages.MessageStatus
 import net.corda.nodeapi.internal.protonwrapper.netty.AMQPClient
 import net.corda.nodeapi.internal.protonwrapper.netty.AMQPServer
-import net.corda.testing.core.ALICE_NAME
-import net.corda.testing.core.BOB_NAME
-import net.corda.testing.core.CHARLIE_NAME
-import net.corda.testing.core.freePort
+import net.corda.testing.core.*
 import net.corda.testing.internal.DEV_INTERMEDIATE_CA
 import net.corda.testing.internal.DEV_ROOT_CA
 import net.corda.testing.internal.rigorousMock
@@ -272,7 +269,8 @@ class CertificateRevocationListNodeTests {
     private fun createClient(targetPort: Int,
                              crlCheckSoftFail: Boolean,
                              nodeCrlDistPoint: String = "http://${server.hostAndPort}/crl/node.crl",
-                             tlsCrlDistPoint: String? = "http://${server.hostAndPort}/crl/empty.crl"): Pair<AMQPClient, X509Certificate> {
+                             tlsCrlDistPoint: String? = "http://${server.hostAndPort}/crl/empty.crl",
+                             maxMessageSize: Int = MAX_MESSAGE_SIZE): Pair<AMQPClient, X509Certificate> {
         val clientConfig = rigorousMock<AbstractNodeConfiguration>().also {
             doReturn(temporaryFolder.root.toPath() / "client").whenever(it).baseDirectory
             doReturn(BOB_NAME).whenever(it).myLegalName
@@ -292,13 +290,15 @@ class CertificateRevocationListNodeTests {
                 clientKeystore,
                 clientConfig.keyStorePassword,
                 clientTruststore,
-                crlCheckSoftFail), nodeCert)
+                crlCheckSoftFail,
+                maxMessageSize = maxMessageSize), nodeCert)
     }
 
     private fun createServer(port: Int, name: CordaX500Name = ALICE_NAME,
                              crlCheckSoftFail: Boolean,
                              nodeCrlDistPoint: String = "http://${server.hostAndPort}/crl/node.crl",
-                             tlsCrlDistPoint: String? = "http://${server.hostAndPort}/crl/empty.crl"): Pair<AMQPServer, X509Certificate> {
+                             tlsCrlDistPoint: String? = "http://${server.hostAndPort}/crl/empty.crl",
+                             maxMessageSize: Int = MAX_MESSAGE_SIZE): Pair<AMQPServer, X509Certificate> {
         val serverConfig = rigorousMock<AbstractNodeConfiguration>().also {
             doReturn(temporaryFolder.root.toPath() / "server").whenever(it).baseDirectory
             doReturn(name).whenever(it).myLegalName
@@ -318,7 +318,8 @@ class CertificateRevocationListNodeTests {
                 serverKeystore,
                 serverConfig.keyStorePassword,
                 serverTruststore,
-                crlCheckSoftFail), nodeCert)
+                crlCheckSoftFail,
+                maxMessageSize = maxMessageSize), nodeCert)
     }
 
     private fun SSLConfiguration.recreateNodeCaAndTlsCertificates(nodeCaCrlDistPoint: String, tlsCrlDistPoint: String?): X509Certificate {
diff --git a/node/src/integration-test/kotlin/net/corda/node/amqp/ProtonWrapperTests.kt b/node/src/integration-test/kotlin/net/corda/node/amqp/ProtonWrapperTests.kt
index ef9e09b741..ca7dab2cf7 100644
--- a/node/src/integration-test/kotlin/net/corda/node/amqp/ProtonWrapperTests.kt
+++ b/node/src/integration-test/kotlin/net/corda/node/amqp/ProtonWrapperTests.kt
@@ -34,6 +34,7 @@ import net.corda.testing.core.*
 import net.corda.testing.internal.createDevIntermediateCaCertPath
 import net.corda.testing.internal.rigorousMock
 import org.apache.activemq.artemis.api.core.RoutingType
+import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.junit.Assert.assertArrayEquals
 import org.junit.Rule
 import org.junit.Test
@@ -91,7 +92,8 @@ class ProtonWrapperTests {
 
     @Test
     fun `AMPQ Client fails to connect when crl soft fail check is disabled`() {
-        val amqpServer = createServer(serverPort, CordaX500Name("Rogue 1", "London", "GB"), false)
+        val amqpServer = createServer(serverPort, CordaX500Name("Rogue 1", "London", "GB"),
+                maxMessageSize = MAX_MESSAGE_SIZE, crlCheckSoftFail = false)
         amqpServer.use {
             amqpServer.start()
             val amqpClient = createClient()
@@ -283,6 +285,52 @@ class ProtonWrapperTests {
         server.stop()
     }
 
+    @Test
+    fun `Send a message larger then maxMessageSize from AMQP to Artemis inbox`() {
+        val maxMessageSize = 100_000
+        val (server, artemisClient) = createArtemisServerAndClient(maxMessageSize)
+        val amqpClient = createClient(maxMessageSize)
+        val clientConnected = amqpClient.onConnection.toFuture()
+        amqpClient.start()
+        assertEquals(true, clientConnected.get().connected)
+        assertEquals(CHARLIE_NAME, CordaX500Name.build(clientConnected.get().remoteCert!!.subjectX500Principal))
+        val artemis = artemisClient.started!!
+        val sendAddress = P2P_PREFIX + "Test"
+        artemis.session.createQueue(sendAddress, RoutingType.ANYCAST, "queue", true)
+        val consumer = artemis.session.createConsumer("queue")
+
+        val testProperty = mutableMapOf<String, Any?>()
+        testProperty["TestProp"] = "1"
+
+        // Send normal message.
+        val testData = ByteArray(maxMessageSize)
+        val message = amqpClient.createMessage(testData, sendAddress, CHARLIE_NAME.toString(), testProperty)
+        amqpClient.write(message)
+        assertEquals(MessageStatus.Acknowledged, message.onComplete.get())
+        val received = consumer.receive()
+        assertEquals("1", received.getStringProperty("TestProp"))
+        assertArrayEquals(testData, ByteArray(received.bodySize).apply { received.bodyBuffer.readBytes(this) })
+
+        // Send message larger then max message size.
+        val largeData = ByteArray(maxMessageSize + 1)
+        // Create message will fail.
+        assertThatThrownBy {
+            amqpClient.createMessage(largeData, sendAddress, CHARLIE_NAME.toString(), testProperty)
+        }.hasMessageContaining("Message exceeds maxMessageSize network parameter")
+
+        // Send normal message again to confirm the large message didn't reach the server and client is not killed by the message.
+        val message2 = amqpClient.createMessage(testData, sendAddress, CHARLIE_NAME.toString(), testProperty)
+        amqpClient.write(message2)
+        assertEquals(MessageStatus.Acknowledged, message2.onComplete.get())
+        val received2 = consumer.receive()
+        assertEquals("1", received2.getStringProperty("TestProp"))
+        assertArrayEquals(testData, ByteArray(received2.bodySize).apply { received2.bodyBuffer.readBytes(this) })
+
+        amqpClient.stop()
+        artemisClient.stop()
+        server.stop()
+    }
+
     @Test
     fun `shared AMQPClient threadpool tests`() {
         val amqpServer = createServer(serverPort)
@@ -333,7 +381,7 @@ class ProtonWrapperTests {
         }
     }
 
-    private fun createArtemisServerAndClient(): Pair<ArtemisMessagingServer, ArtemisMessagingClient> {
+    private fun createArtemisServerAndClient(maxMessageSize: Int = MAX_MESSAGE_SIZE): Pair<ArtemisMessagingServer, ArtemisMessagingClient> {
         val artemisConfig = rigorousMock<AbstractNodeConfiguration>().also {
             doReturn(temporaryFolder.root.toPath() / "artemis").whenever(it).baseDirectory
             doReturn(CHARLIE_NAME).whenever(it).myLegalName
@@ -347,14 +395,14 @@ class ProtonWrapperTests {
         }
         artemisConfig.configureWithDevSSLCertificate()
 
-        val server = ArtemisMessagingServer(artemisConfig, NetworkHostAndPort("0.0.0.0", artemisPort), MAX_MESSAGE_SIZE)
-        val client = ArtemisMessagingClient(artemisConfig, NetworkHostAndPort("localhost", artemisPort), MAX_MESSAGE_SIZE)
+        val server = ArtemisMessagingServer(artemisConfig, NetworkHostAndPort("0.0.0.0", artemisPort), maxMessageSize)
+        val client = ArtemisMessagingClient(artemisConfig, NetworkHostAndPort("localhost", artemisPort), maxMessageSize)
         server.start()
         client.start()
         return Pair(server, client)
     }
 
-    private fun createClient(): AMQPClient {
+    private fun createClient(maxMessageSize: Int = MAX_MESSAGE_SIZE): AMQPClient {
         val clientConfig = rigorousMock<AbstractNodeConfiguration>().also {
             doReturn(temporaryFolder.root.toPath() / "client").whenever(it).baseDirectory
             doReturn(BOB_NAME).whenever(it).myLegalName
@@ -376,10 +424,11 @@ class ProtonWrapperTests {
                 clientKeystore,
                 clientConfig.keyStorePassword,
                 clientTruststore,
-                true)
+                true,
+                maxMessageSize = maxMessageSize)
     }
 
-    private fun createSharedThreadsClient(sharedEventGroup: EventLoopGroup, id: Int): AMQPClient {
+    private fun createSharedThreadsClient(sharedEventGroup: EventLoopGroup, id: Int, maxMessageSize: Int = MAX_MESSAGE_SIZE): AMQPClient {
         val clientConfig = rigorousMock<AbstractNodeConfiguration>().also {
             doReturn(temporaryFolder.root.toPath() / "client_%$id").whenever(it).baseDirectory
             doReturn(CordaX500Name(null, "client $id", "Corda", "London", null, "GB")).whenever(it).myLegalName
@@ -400,10 +449,14 @@ class ProtonWrapperTests {
                 clientConfig.keyStorePassword,
                 clientTruststore,
                 true,
-                sharedThreadPool = sharedEventGroup)
+                sharedThreadPool = sharedEventGroup,
+                maxMessageSize = maxMessageSize)
     }
 
-    private fun createServer(port: Int, name: CordaX500Name = ALICE_NAME, crlCheckSoftFail: Boolean = true): AMQPServer {
+
+    private fun createServer(port: Int, name: CordaX500Name = ALICE_NAME,  maxMessageSize: Int = MAX_MESSAGE_SIZE,
+                             crlCheckSoftFail: Boolean = true
+    ): AMQPServer {
         val serverConfig = rigorousMock<AbstractNodeConfiguration>().also {
             doReturn(temporaryFolder.root.toPath() / "server").whenever(it).baseDirectory
             doReturn(name).whenever(it).myLegalName
@@ -423,6 +476,7 @@ class ProtonWrapperTests {
                 serverKeystore,
                 serverConfig.keyStorePassword,
                 serverTruststore,
-                crlCheckSoftFail = true)
+                crlCheckSoftFail = true,
+                maxMessageSize = maxMessageSize)
     }
 }
diff --git a/node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcExceptionHandlingTest.kt b/node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcExceptionHandlingTest.kt
index 03e9585e2f..b0251c9f06 100644
--- a/node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcExceptionHandlingTest.kt
+++ b/node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcExceptionHandlingTest.kt
@@ -45,12 +45,12 @@ class RpcExceptionHandlingTest : IntegrationTest() {
 
             val node = startNode(NodeParameters(rpcUsers = users)).getOrThrow()
 
-            assertThatCode { node.rpc.startFlow(::Flow).returnValue.getOrThrow() }
-                    .isInstanceOfSatisfying(InternalNodeException::class.java) { exception ->
-                        assertThat(exception).hasNoCause()
-                        assertThat(exception.stackTrace).isEmpty()
-                        assertThat(exception.message).isEqualTo(InternalNodeException.defaultMessage())
-                    }
+            assertThatCode { node.rpc.startFlow(::Flow).returnValue.getOrThrow() }.isInstanceOfSatisfying(InternalNodeException::class.java) { exception ->
+
+                assertThat(exception).hasNoCause()
+                assertThat(exception.stackTrace).isEmpty()
+                assertThat(exception.message).isEqualTo(InternalNodeException.defaultMessage())
+            }
         }
     }
 
@@ -61,12 +61,12 @@ class RpcExceptionHandlingTest : IntegrationTest() {
             val node = startNode(NodeParameters(rpcUsers = users)).getOrThrow()
             val clientRelevantMessage = "This is for the players!"
 
-            assertThatCode { node.rpc.startFlow(::ClientRelevantErrorFlow, clientRelevantMessage).returnValue.getOrThrow() }
-                    .isInstanceOfSatisfying(ClientRelevantException::class.java) { exception ->
-                        assertThat(exception).hasNoCause()
-                        assertThat(exception.stackTrace).isEmpty()
-                        assertThat(exception.message).isEqualTo(clientRelevantMessage)
-                    }
+            assertThatCode { node.rpc.startFlow(::ClientRelevantErrorFlow, clientRelevantMessage).returnValue.getOrThrow() }.isInstanceOfSatisfying(ClientRelevantException::class.java) { exception ->
+
+                assertThat(exception).hasNoCause()
+                assertThat(exception.stackTrace).isEmpty()
+                assertThat(exception.message).isEqualTo(clientRelevantMessage)
+            }
         }
     }
 
@@ -93,10 +93,11 @@ class RpcExceptionHandlingTest : IntegrationTest() {
 
             assertThatCode { nodeA.rpc.startFlow(::InitFlow, nodeB.nodeInfo.singleIdentity()).returnValue.getOrThrow() }
                     .isInstanceOfSatisfying(InternalNodeException::class.java) { exception ->
-                        assertThat(exception).hasNoCause()
-                        assertThat(exception.stackTrace).isEmpty()
-                        assertThat(exception.message).isEqualTo(InternalNodeException.defaultMessage())
-                    }
+
+                assertThat(exception).hasNoCause()
+                assertThat(exception.stackTrace).isEmpty()
+                assertThat(exception.message).isEqualTo(InternalNodeException.defaultMessage())
+            }
         }
     }
 }
diff --git a/node/src/main/kotlin/net/corda/node/internal/Node.kt b/node/src/main/kotlin/net/corda/node/internal/Node.kt
index a159b97714..56f980996a 100644
--- a/node/src/main/kotlin/net/corda/node/internal/Node.kt
+++ b/node/src/main/kotlin/net/corda/node/internal/Node.kt
@@ -11,7 +11,7 @@
 package net.corda.node.internal
 
 import com.codahale.metrics.JmxReporter
-import net.corda.client.rpc.internal.serialization.kryo.KryoClientSerializationScheme
+import net.corda.client.rpc.internal.serialization.amqp.AMQPClientSerializationScheme
 import net.corda.core.concurrent.CordaFuture
 import net.corda.core.internal.Emoji
 import net.corda.core.internal.concurrent.openFuture
@@ -36,6 +36,7 @@ import net.corda.node.internal.artemis.BrokerAddresses
 import net.corda.node.internal.cordapp.CordappLoader
 import net.corda.node.internal.security.RPCSecurityManagerImpl
 import net.corda.node.internal.security.RPCSecurityManagerWithAdditionalUser
+import net.corda.node.serialization.amqp.AMQPServerSerializationScheme
 import net.corda.node.serialization.kryo.KryoServerSerializationScheme
 import net.corda.node.services.api.NodePropertiesStore
 import net.corda.node.services.api.SchemaService
@@ -52,7 +53,6 @@ import net.corda.nodeapi.internal.addShutdownHook
 import net.corda.nodeapi.internal.bridging.BridgeControlListener
 import net.corda.nodeapi.internal.persistence.CordaPersistence
 import net.corda.nodeapi.internal.serialization.*
-import net.corda.nodeapi.internal.serialization.amqp.AMQPServerSerializationScheme
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import rx.Scheduler
@@ -108,14 +108,14 @@ open class Node(configuration: NodeConfiguration,
         const val scanPackagesSeparator = ","
 
         @JvmStatic
-        protected fun makeCordappLoader(configuration: NodeConfiguration, versionInfo: VersionInfo): CordappLoader {
+        private fun makeCordappLoader(configuration: NodeConfiguration, versionInfo: VersionInfo): CordappLoader {
+
             return System.getProperty(scanPackagesSystemProperty)?.let { scanPackages ->
                 CordappLoader.createDefaultWithTestPackages(configuration, scanPackages.split(scanPackagesSeparator), versionInfo)
             } ?: CordappLoader.createDefault(configuration.baseDirectory, versionInfo)
         }
-
-        // TODO Wire up maxMessageSize
-        const val MAX_FILE_SIZE = 10485760
+        // TODO: make this configurable.
+        const val MAX_RPC_MESSAGE_SIZE = 10485760
     }
 
     override val log: Logger get() = staticLog
@@ -185,7 +185,7 @@ open class Node(configuration: NodeConfiguration,
 
         if (!configuration.messagingServerExternal) {
             val brokerBindAddress = configuration.messagingServerAddress ?: NetworkHostAndPort("0.0.0.0", configuration.p2pAddress.port)
-            messageBroker = ArtemisMessagingServer(configuration, brokerBindAddress, MAX_FILE_SIZE)
+            messageBroker = ArtemisMessagingServer(configuration, brokerBindAddress, networkParameters.maxMessageSize)
         }
 
         val serverAddress = configuration.messagingServerAddress ?: NetworkHostAndPort("localhost", configuration.p2pAddress.port)
@@ -194,18 +194,21 @@ open class Node(configuration: NodeConfiguration,
         } else {
             startLocalRpcBroker()
         }
+
         val advertisedAddress = info.addresses.single()
         val externalBridge = configuration.enterpriseConfiguration.externalBridge
         if (externalBridge == null || !externalBridge) {
-            bridgeControlListener = BridgeControlListener(configuration, serverAddress, /*networkParameters.maxMessageSize*/MAX_FILE_SIZE)
+            bridgeControlListener = BridgeControlListener(configuration, serverAddress, networkParameters.maxMessageSize)
         }
+
         printBasicNodeInfo("Advertised P2P messaging addresses", info.addresses.joinToString())
 
         val rpcServerConfiguration = RPCServerConfiguration.default.copy(
                 rpcThreadPoolSize = configuration.enterpriseConfiguration.tuning.rpcThreadPoolSize
         )
         rpcServerAddresses?.let {
-            rpcMessagingClient = RPCMessagingClient(configuration.rpcOptions.sslConfig, it.admin, /*networkParameters.maxMessageSize*/MAX_FILE_SIZE, rpcServerConfiguration)
+            rpcMessagingClient = RPCMessagingClient(configuration.rpcOptions.sslConfig, it.admin, MAX_RPC_MESSAGE_SIZE, rpcServerConfiguration)
+
             printBasicNodeInfo("RPC connection address", it.primary.toString())
             printBasicNodeInfo("RPC admin connection address", it.admin.toString())
         }
@@ -227,7 +230,7 @@ open class Node(configuration: NodeConfiguration,
                 services.monitoringService.metrics,
                 info.legalIdentities[0].name.toString(),
                 advertisedAddress,
-                /*networkParameters.maxMessageSize*/MAX_FILE_SIZE,
+                networkParameters.maxMessageSize,
                 nodeProperties.flowsDrainingMode::isEnabled,
                 nodeProperties.flowsDrainingMode.values)
     }
@@ -239,9 +242,9 @@ open class Node(configuration: NodeConfiguration,
                 val rpcBrokerDirectory: Path = baseDirectory / "brokers" / "rpc"
                 with(rpcOptions) {
                     rpcBroker = if (useSsl) {
-                        ArtemisRpcBroker.withSsl(this.address!!, sslConfig, securityManager, certificateChainCheckPolicies, /*networkParameters.maxMessageSize*/MAX_FILE_SIZE, jmxMonitoringHttpPort != null, rpcBrokerDirectory)
+                        ArtemisRpcBroker.withSsl(this.address!!, sslConfig, securityManager, certificateChainCheckPolicies, MAX_RPC_MESSAGE_SIZE, jmxMonitoringHttpPort != null, rpcBrokerDirectory)
                     } else {
-                        ArtemisRpcBroker.withoutSsl(this.address!!, adminAddress!!, sslConfig, securityManager, certificateChainCheckPolicies, /*networkParameters.maxMessageSize*/MAX_FILE_SIZE, jmxMonitoringHttpPort != null, rpcBrokerDirectory)
+                        ArtemisRpcBroker.withoutSsl(this.address!!, adminAddress!!, sslConfig, securityManager, certificateChainCheckPolicies, MAX_RPC_MESSAGE_SIZE, jmxMonitoringHttpPort != null, rpcBrokerDirectory)
                     }
                 }
                 return rpcBroker!!.addresses
@@ -412,15 +415,15 @@ open class Node(configuration: NodeConfiguration,
         val classloader = cordappLoader.appClassLoader
         nodeSerializationEnv = SerializationEnvironmentImpl(
                 SerializationFactoryImpl().apply {
-                    registerScheme(KryoServerSerializationScheme())
                     registerScheme(AMQPServerSerializationScheme(cordappLoader.cordapps))
-                    registerScheme(KryoClientSerializationScheme())
+                    registerScheme(AMQPClientSerializationScheme(cordappLoader.cordapps))
+                    registerScheme(KryoServerSerializationScheme() )
                 },
                 p2pContext = AMQP_P2P_CONTEXT.withClassLoader(classloader),
-                rpcServerContext = KRYO_RPC_SERVER_CONTEXT.withClassLoader(classloader),
+                rpcServerContext = AMQP_RPC_SERVER_CONTEXT.withClassLoader(classloader),
                 storageContext = AMQP_STORAGE_CONTEXT.withClassLoader(classloader),
                 checkpointContext = KRYO_CHECKPOINT_CONTEXT.withClassLoader(classloader),
-                rpcClientContext = if (configuration.shouldInitCrashShell()) KRYO_RPC_CLIENT_CONTEXT.withClassLoader(classloader) else null) //even Shell embeded in the node connects via RPC to the node
+                rpcClientContext = if (configuration.shouldInitCrashShell()) AMQP_RPC_CLIENT_CONTEXT.withClassLoader(classloader) else null) //even Shell embeded in the node connects via RPC to the node
     }
 
     private var rpcMessagingClient: RPCMessagingClient? = null
diff --git a/node/src/main/kotlin/net/corda/node/serialization/amqp/AMQPServerSerializationScheme.kt b/node/src/main/kotlin/net/corda/node/serialization/amqp/AMQPServerSerializationScheme.kt
new file mode 100644
index 0000000000..dc9ea63428
--- /dev/null
+++ b/node/src/main/kotlin/net/corda/node/serialization/amqp/AMQPServerSerializationScheme.kt
@@ -0,0 +1,46 @@
+package net.corda.node.serialization.amqp
+
+import net.corda.core.cordapp.Cordapp
+import net.corda.core.serialization.ClassWhitelist
+import net.corda.core.serialization.SerializationContext
+import net.corda.core.serialization.SerializationCustomSerializer
+import net.corda.nodeapi.internal.serialization.CordaSerializationMagic
+import net.corda.nodeapi.internal.serialization.amqp.AbstractAMQPSerializationScheme
+import net.corda.nodeapi.internal.serialization.amqp.SerializerFactory
+import net.corda.nodeapi.internal.serialization.amqp.custom.RxNotificationSerializer
+
+import java.util.concurrent.ConcurrentHashMap
+
+/**
+ * When set as the serialization scheme, defines the RPC Server serialization scheme as using the Corda
+ * AMQP implementation.
+ */
+class AMQPServerSerializationScheme(
+        cordappCustomSerializers: Set<SerializationCustomSerializer<*, *>>,
+        serializerFactoriesForContexts: MutableMap<Pair<ClassWhitelist, ClassLoader>, SerializerFactory>
+) : AbstractAMQPSerializationScheme(cordappCustomSerializers, serializerFactoriesForContexts) {
+    constructor(cordapps: List<Cordapp>) : this(cordapps.customSerializers, ConcurrentHashMap())
+
+    constructor() : this(emptySet(), ConcurrentHashMap())
+
+    override fun rpcClientSerializerFactory(context: SerializationContext): SerializerFactory {
+        throw UnsupportedOperationException()
+    }
+
+    override fun rpcServerSerializerFactory(context: SerializationContext) =
+        SerializerFactory(
+                context.whitelist,
+                context.deserializationClassLoader
+        ).apply {
+            register(RpcServerObservableSerializer())
+            register(RpcServerCordaFutureSerializer(this))
+            register(RxNotificationSerializer(this))
+        }
+
+    override fun canDeserializeVersion(magic: CordaSerializationMagic, target: SerializationContext.UseCase): Boolean {
+        return canDeserializeVersion(magic) &&
+                (   target == SerializationContext.UseCase.P2P
+                 || target == SerializationContext.UseCase.Storage
+                 || target == SerializationContext.UseCase.RPCServer)
+    }
+}
diff --git a/node/src/main/kotlin/net/corda/node/serialization/amqp/RpcServerCordaFutureSerialiser.kt b/node/src/main/kotlin/net/corda/node/serialization/amqp/RpcServerCordaFutureSerialiser.kt
new file mode 100644
index 0000000000..f66e3c5daf
--- /dev/null
+++ b/node/src/main/kotlin/net/corda/node/serialization/amqp/RpcServerCordaFutureSerialiser.kt
@@ -0,0 +1,35 @@
+package net.corda.node.serialization.amqp
+
+import net.corda.core.concurrent.CordaFuture
+import net.corda.core.toObservable
+import net.corda.nodeapi.internal.serialization.amqp.CustomSerializer
+import net.corda.nodeapi.internal.serialization.amqp.SerializerFactory
+import rx.Observable
+import java.io.NotSerializableException
+
+/**
+ * Serializer for [CordaFuture] objects where Futures are converted to Observables and
+ * are thus dealt with by the [RpcServerObservableSerializer]
+ */
+class RpcServerCordaFutureSerializer(factory: SerializerFactory)
+    : CustomSerializer.Proxy<CordaFuture<*>,
+        RpcServerCordaFutureSerializer.FutureProxy>(
+        CordaFuture::class.java, RpcServerCordaFutureSerializer.FutureProxy::class.java, factory
+) {
+    override fun fromProxy(proxy: RpcServerCordaFutureSerializer.FutureProxy): CordaFuture<*> {
+        throw UnsupportedOperationException()
+    }
+
+    override fun toProxy(obj: CordaFuture<*>): RpcServerCordaFutureSerializer.FutureProxy {
+        try {
+            return FutureProxy(obj.toObservable())
+        } catch (e: NotSerializableException) {
+            throw (NotSerializableException("Failed to serialize Future as proxy Observable - ${e.message}"))
+        }
+    }
+
+    data class FutureProxy(val observable: Observable<*>)
+}
+
+
+
diff --git a/node/src/main/kotlin/net/corda/node/serialization/amqp/RpcServerObservableSerializer.kt b/node/src/main/kotlin/net/corda/node/serialization/amqp/RpcServerObservableSerializer.kt
new file mode 100644
index 0000000000..312a4906cc
--- /dev/null
+++ b/node/src/main/kotlin/net/corda/node/serialization/amqp/RpcServerObservableSerializer.kt
@@ -0,0 +1,140 @@
+package net.corda.node.serialization.amqp
+
+import net.corda.core.context.Trace
+import net.corda.core.serialization.SerializationContext
+import net.corda.core.utilities.loggerFor
+import net.corda.node.services.messaging.ObservableContextInterface
+import net.corda.node.services.messaging.ObservableSubscription
+import net.corda.nodeapi.RPCApi
+import net.corda.nodeapi.internal.serialization.amqp.*
+import org.apache.qpid.proton.codec.Data
+
+import rx.Notification
+import rx.Observable
+import rx.Subscriber
+import java.io.NotSerializableException
+
+import java.lang.reflect.Type
+
+/**
+ * Server side serializer that notionally serializes RxObservables when used by the RPC
+ * framework for event subscriptions. Notional in the sense that the actual observable
+ * isn't serialized, rather a reference to the observable is, this is then used by
+ * the client side RPC handler to subscribe to the observable stream.
+ */
+class RpcServerObservableSerializer : CustomSerializer.Implements<Observable<*>>(
+        Observable::class.java
+) {
+    // Would be great to make this private, but then it's so much harder to unit test
+    object RpcObservableContextKey
+
+    companion object {
+        fun createContext(
+                serializationContext: SerializationContext,
+                observableContext: ObservableContextInterface
+        ) = serializationContext.withProperty(
+                RpcServerObservableSerializer.RpcObservableContextKey, observableContext)
+    }
+
+    override val schemaForDocumentation = Schema(
+            listOf(
+                    CompositeType(
+                            name = type.toString(),
+                            label = "",
+                            provides = emptyList(),
+                            descriptor = descriptor,
+                            fields = listOf(
+                                    Field(
+                                            name = "observableId",
+                                            type = "string",
+                                            requires = emptyList(),
+                                            default = null,
+                                            label = null,
+                                            mandatory = true,
+                                            multiple = false),
+                                    Field(
+                                            name = "observableInstant",
+                                            type = "long",
+                                            requires = emptyList(),
+                                            default = null,
+                                            label = null,
+                                            mandatory = true,
+                                            multiple = false)
+                            ))))
+
+    override fun readObject(
+            obj: Any, schemas: SerializationSchemas,
+            input: DeserializationInput,
+            context: SerializationContext
+    ): Observable<*> {
+        throw UnsupportedOperationException()
+    }
+
+    override fun writeDescribedObject(
+            obj: Observable<*>,
+            data: Data,
+            type: Type,
+            output: SerializationOutput,
+            context: SerializationContext
+    ) {
+        val observableId = Trace.InvocationId.newInstance()
+        if (RpcServerObservableSerializer.RpcObservableContextKey !in context.properties) {
+            throw NotSerializableException("Missing Observable Key on serialization context - $type")
+        }
+
+        val observableContext = context.properties[RpcServerObservableSerializer.RpcObservableContextKey]
+                as ObservableContextInterface
+
+        data.withList {
+            data.putString(observableId.value)
+            data.putLong(observableId.timestamp.toEpochMilli())
+        }
+
+        val observableWithSubscription = ObservableSubscription(
+                subscription = obj.materialize().subscribe(
+                        object : Subscriber<Notification<*>>() {
+                            override fun onNext(observation: Notification<*>) {
+                                if (!isUnsubscribed) {
+                                    val message = RPCApi.ServerToClient.Observation(
+                                            id = observableId,
+                                            content = observation,
+                                            deduplicationIdentity = observableContext.deduplicationIdentity
+                                    )
+                                    observableContext.sendMessage(message)
+                                }
+                            }
+
+                            override fun onError(exception: Throwable) {
+                                loggerFor<RpcServerObservableSerializer>().error(
+                                        "onError called in materialize()d RPC Observable", exception)
+                            }
+
+                            override fun onCompleted() {
+                                observableContext.clientAddressToObservables.compute(observableContext.clientAddress) { _, observables ->
+                                    if (observables != null) {
+                                        observables.remove(observableId)
+                                        if (observables.isEmpty()) {
+                                            null
+                                        } else {
+                                            observables
+                                        }
+                                    } else {
+                                        null
+                                    }
+                                }
+                            }
+                        }
+                )
+        )
+
+        observableContext.clientAddressToObservables.compute(observableContext.clientAddress) { _, observables ->
+            if (observables == null) {
+                hashSetOf(observableId)
+            } else {
+                observables.add(observableId)
+                observables
+            }
+        }
+        observableContext.observableMap.put(observableId, observableWithSubscription)
+    }
+}
\ No newline at end of file
diff --git a/node/src/main/kotlin/net/corda/node/serialization/kryo/KryoServerSerializationScheme.kt b/node/src/main/kotlin/net/corda/node/serialization/kryo/KryoServerSerializationScheme.kt
index 22d8ca438c..d87fcd7e74 100644
--- a/node/src/main/kotlin/net/corda/node/serialization/kryo/KryoServerSerializationScheme.kt
+++ b/node/src/main/kotlin/net/corda/node/serialization/kryo/KryoServerSerializationScheme.kt
@@ -14,22 +14,15 @@ import com.esotericsoftware.kryo.pool.KryoPool
 import net.corda.core.serialization.SerializationContext
 import net.corda.nodeapi.internal.serialization.CordaSerializationMagic
 import net.corda.nodeapi.internal.serialization.kryo.AbstractKryoSerializationScheme
-import net.corda.nodeapi.internal.serialization.kryo.DefaultKryoCustomizer
 import net.corda.nodeapi.internal.serialization.kryo.kryoMagic
-import net.corda.nodeapi.internal.serialization.kryo.RPCKryo
 
 class KryoServerSerializationScheme : AbstractKryoSerializationScheme() {
     override fun canDeserializeVersion(magic: CordaSerializationMagic, target: SerializationContext.UseCase): Boolean {
-        return magic == kryoMagic && target != SerializationContext.UseCase.RPCClient
+        return magic == kryoMagic && target == SerializationContext.UseCase.Checkpoint
     }
 
     override fun rpcClientKryoPool(context: SerializationContext): KryoPool = throw UnsupportedOperationException()
 
-    override fun rpcServerKryoPool(context: SerializationContext): KryoPool {
-        return KryoPool.Builder {
-            DefaultKryoCustomizer.customize(RPCKryo(RpcServerObservableSerializer, context), publicKeySerializer).apply {
-                classLoader = context.deserializationClassLoader
-            }
-        }.build()
-    }
+    override fun rpcServerKryoPool(context: SerializationContext): KryoPool = throw UnsupportedOperationException()
+
 }
\ No newline at end of file
diff --git a/node/src/main/kotlin/net/corda/node/serialization/kryo/RpcServerObservableSerializer.kt b/node/src/main/kotlin/net/corda/node/serialization/kryo/RpcServerObservableSerializer.kt
deleted file mode 100644
index 51013a9bce..0000000000
--- a/node/src/main/kotlin/net/corda/node/serialization/kryo/RpcServerObservableSerializer.kt
+++ /dev/null
@@ -1,87 +0,0 @@
-package net.corda.node.serialization.kryo
-
-import com.esotericsoftware.kryo.Kryo
-import com.esotericsoftware.kryo.Serializer
-import com.esotericsoftware.kryo.io.Input
-import com.esotericsoftware.kryo.io.Output
-import net.corda.core.context.Trace
-import net.corda.core.serialization.SerializationContext
-import net.corda.core.serialization.SerializationDefaults
-import net.corda.node.services.messaging.ObservableSubscription
-import net.corda.node.services.messaging.RPCServer
-import net.corda.nodeapi.RPCApi
-import org.slf4j.LoggerFactory
-import rx.Notification
-import rx.Observable
-import rx.Subscriber
-
-object RpcServerObservableSerializer : Serializer<Observable<*>>() {
-    private object RpcObservableContextKey
-
-    private val log = LoggerFactory.getLogger(javaClass)
-    fun createContext(observableContext: RPCServer.ObservableContext): SerializationContext {
-        return SerializationDefaults.RPC_SERVER_CONTEXT.withProperty(RpcServerObservableSerializer.RpcObservableContextKey, observableContext)
-    }
-
-    override fun read(kryo: Kryo?, input: Input?, type: Class<Observable<*>>?): Observable<Any> {
-        throw UnsupportedOperationException()
-    }
-
-    override fun write(kryo: Kryo, output: Output, observable: Observable<*>) {
-        val observableId = Trace.InvocationId.newInstance()
-        val observableContext = kryo.context[RpcObservableContextKey] as RPCServer.ObservableContext
-        output.writeInvocationId(observableId)
-        val observableWithSubscription = ObservableSubscription(
-                // We capture [observableContext] in the subscriber. Note that all synchronisation/kryo borrowing
-                // must be done again within the subscriber
-                subscription = observable.materialize().subscribe(
-                        object : Subscriber<Notification<*>>() {
-                            override fun onNext(observation: Notification<*>) {
-                                if (!isUnsubscribed) {
-                                    val message = RPCApi.ServerToClient.Observation(
-                                            id = observableId,
-                                            content = observation,
-                                            deduplicationIdentity = observableContext.deduplicationIdentity
-                                    )
-                                    observableContext.sendMessage(message)
-                                }
-                            }
-
-                            override fun onError(exception: Throwable) {
-                                log.error("onError called in materialize()d RPC Observable", exception)
-                            }
-
-                            override fun onCompleted() {
-                                observableContext.clientAddressToObservables.compute(observableContext.clientAddress) { _, observables ->
-                                    if (observables != null) {
-                                        observables.remove(observableId)
-                                        if (observables.isEmpty()) {
-                                            null
-                                        } else {
-                                            observables
-                                        }
-                                    } else {
-                                        null
-                                    }
-                                }
-                            }
-                        }
-                )
-        )
-        observableContext.clientAddressToObservables.compute(observableContext.clientAddress) { _, observables ->
-            if (observables == null) {
-                hashSetOf(observableId)
-            } else {
-                observables.add(observableId)
-                observables
-            }
-        }
-        observableContext.observableMap.put(observableId, observableWithSubscription)
-    }
-
-    private fun Output.writeInvocationId(id: Trace.InvocationId) {
-
-        writeString(id.value)
-        writeLong(id.timestamp.toEpochMilli())
-    }
-}
\ No newline at end of file
diff --git a/node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt b/node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
index ad9d904de8..0aaf718546 100644
--- a/node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
+++ b/node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
@@ -27,6 +27,7 @@ import net.corda.nodeapi.internal.config.parseAs
 import net.corda.nodeapi.internal.persistence.CordaPersistence.DataSourceConfigTag
 import net.corda.nodeapi.internal.persistence.DatabaseConfig
 import net.corda.tools.shell.SSHDConfiguration
+import org.bouncycastle.asn1.x500.X500Name
 import org.slf4j.Logger
 import java.net.URL
 import java.nio.file.Path
@@ -70,6 +71,8 @@ interface NodeConfiguration : NodeSSLConfiguration {
     // do not change this value without syncing it with ScheduledFlowsDrainingModeTest
     val drainingModePollPeriod: Duration get() = Duration.ofSeconds(5)
     val extraNetworkMapKeys: List<UUID>
+    val tlsCertCrlDistPoint: URL?
+    val tlsCertCrlIssuer: String?
 
     fun validate(): List<String>
 
@@ -190,6 +193,8 @@ data class NodeConfigurationImpl(
         override val crlCheckSoftFail: Boolean,
         override val dataSourceProperties: Properties,
         override val compatibilityZoneURL: URL? = null,
+        override val tlsCertCrlDistPoint: URL? = null,
+        override val tlsCertCrlIssuer: String? = null,
         override val rpcUsers: List<User>,
         override val security: SecurityConfiguration? = null,
         override val verifierType: VerifierType,
@@ -241,10 +246,29 @@ data class NodeConfigurationImpl(
         }.asOptions(fallbackSslOptions)
     }
 
+    private fun validateTlsCertCrlConfig(): List<String> {
+        val errors = mutableListOf<String>()
+        if (tlsCertCrlIssuer != null) {
+            if (tlsCertCrlDistPoint == null) {
+                errors += "tlsCertCrlDistPoint needs to be specified when tlsCertCrlIssuer is not NULL"
+            }
+            try {
+                X500Name(tlsCertCrlIssuer)
+            } catch (e: Exception) {
+                errors += "Error when parsing tlsCertCrlIssuer: ${e.message}"
+            }
+        }
+        if (!crlCheckSoftFail && tlsCertCrlDistPoint == null) {
+            errors += "tlsCertCrlDistPoint needs to be specified when crlCheckSoftFail is FALSE"
+        }
+        return errors
+    }
+
     override fun validate(): List<String> {
         val errors = mutableListOf<String>()
         errors += validateDevModeOptions()
         errors += validateRpcOptions(rpcOptions)
+        errors += validateTlsCertCrlConfig()
         return errors
     }
 
diff --git a/node/src/main/kotlin/net/corda/node/services/messaging/ArtemisMessagingServer.kt b/node/src/main/kotlin/net/corda/node/services/messaging/ArtemisMessagingServer.kt
index 1c9db2dbaf..0445f524a3 100644
--- a/node/src/main/kotlin/net/corda/node/services/messaging/ArtemisMessagingServer.kt
+++ b/node/src/main/kotlin/net/corda/node/services/messaging/ArtemisMessagingServer.kt
@@ -29,7 +29,10 @@ import net.corda.node.services.messaging.NodeLoginModule.Companion.VERIFIER_ROLE
 import net.corda.nodeapi.ArtemisTcpTransport
 import net.corda.nodeapi.ConnectionDirection
 import net.corda.nodeapi.VerifierApi
+import net.corda.nodeapi.internal.AmqpMessageSizeChecksInterceptor
+import net.corda.nodeapi.internal.ArtemisMessageSizeChecksInterceptor
 import net.corda.nodeapi.internal.ArtemisMessagingComponent.Companion.INTERNAL_PREFIX
+import net.corda.nodeapi.internal.ArtemisMessagingComponent.Companion.JOURNAL_HEADER_SIZE
 import net.corda.nodeapi.internal.ArtemisMessagingComponent.Companion.NODE_USER
 import net.corda.nodeapi.internal.ArtemisMessagingComponent.Companion.NOTIFICATIONS_ADDRESS
 import net.corda.nodeapi.internal.ArtemisMessagingComponent.Companion.P2P_PREFIX
@@ -79,7 +82,7 @@ import javax.security.auth.spi.LoginModule
 @ThreadSafe
 class ArtemisMessagingServer(private val config: NodeConfiguration,
                              private val messagingServerAddress: NetworkHostAndPort,
-                             val maxMessageSize: Int) : ArtemisBroker, SingletonSerializeAsToken() {
+                             private val maxMessageSize: Int) : ArtemisBroker, SingletonSerializeAsToken() {
     companion object {
         private val log = contextLogger()
     }
@@ -127,8 +130,11 @@ class ArtemisMessagingServer(private val config: NodeConfiguration,
             registerPostQueueCreationCallback { log.debug { "Queue Created: $it" } }
             registerPostQueueDeletionCallback { address, qName -> log.debug { "Queue deleted: $qName for $address" } }
         }
-        // Config driven switch between legacy CORE bridges and the newer AMQP protocol bridges.
+
         activeMQServer.start()
+        activeMQServer.remotingService.addIncomingInterceptor(ArtemisMessageSizeChecksInterceptor(maxMessageSize))
+        activeMQServer.remotingService.addIncomingInterceptor(AmqpMessageSizeChecksInterceptor(maxMessageSize))
+        // Config driven switch between legacy CORE bridges and the newer AMQP protocol bridges.
         log.info("P2P messaging server listening on $messagingServerAddress")
     }
 
@@ -147,9 +153,9 @@ class ArtemisMessagingServer(private val config: NodeConfiguration,
         idCacheSize = 2000 // Artemis Default duplicate cache size i.e. a guess
         isPersistIDCache = true
         isPopulateValidatedUser = true
-        journalBufferSize_NIO = maxMessageSize // Artemis default is 490KiB - required to address IllegalArgumentException (when Artemis uses Java NIO): Record is too large to store.
-        journalBufferSize_AIO = maxMessageSize // Required to address IllegalArgumentException (when Artemis uses Linux Async IO): Record is too large to store.
-        journalFileSize = maxMessageSize // The size of each journal file in bytes. Artemis default is 10MiB.
+        journalBufferSize_NIO = maxMessageSize + JOURNAL_HEADER_SIZE // Artemis default is 490KiB - required to address IllegalArgumentException (when Artemis uses Java NIO): Record is too large to store.
+        journalBufferSize_AIO = maxMessageSize + JOURNAL_HEADER_SIZE // Required to address IllegalArgumentException (when Artemis uses Linux Async IO): Record is too large to store.
+        journalFileSize = maxMessageSize + JOURNAL_HEADER_SIZE// The size of each journal file in bytes. Artemis default is 10MiB.
         managementNotificationAddress = SimpleString(NOTIFICATIONS_ADDRESS)
         connectionTtlCheckInterval = config.enterpriseConfiguration.tuning.brokerConnectionTtlCheckIntervalMs
         // JMX enablement
diff --git a/node/src/main/kotlin/net/corda/node/services/messaging/ObservableContextInterface.kt b/node/src/main/kotlin/net/corda/node/services/messaging/ObservableContextInterface.kt
new file mode 100644
index 0000000000..32adde2e64
--- /dev/null
+++ b/node/src/main/kotlin/net/corda/node/services/messaging/ObservableContextInterface.kt
@@ -0,0 +1,21 @@
+package net.corda.node.services.messaging
+
+import com.github.benmanes.caffeine.cache.Cache
+import net.corda.core.context.Trace
+import net.corda.nodeapi.RPCApi
+import org.apache.activemq.artemis.api.core.SimpleString
+import java.util.concurrent.ConcurrentHashMap
+
+/**
+ * An observable context is constructed on each RPC request. If subsequently a nested Observable is encountered this
+ * same context is propagated by the serialization context. This way all observations rooted in a single RPC will be
+ * muxed correctly. Note that the context construction itself is quite cheap.
+ */
+interface ObservableContextInterface {
+    fun sendMessage(serverToClient: RPCApi.ServerToClient)
+
+    val observableMap: Cache<Trace.InvocationId, ObservableSubscription>
+    val clientAddressToObservables: ConcurrentHashMap<SimpleString, HashSet<Trace.InvocationId>>
+    val deduplicationIdentity: String
+    val clientAddress: SimpleString
+}
\ No newline at end of file
diff --git a/node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt b/node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt
index 384f303765..e55f5e2f99 100644
--- a/node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt
+++ b/node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt
@@ -46,6 +46,7 @@ import net.corda.nodeapi.internal.ArtemisMessagingComponent
 import net.corda.nodeapi.internal.ArtemisMessagingComponent.ArtemisAddress
 import net.corda.nodeapi.internal.ArtemisMessagingComponent.Companion.BRIDGE_CONTROL
 import net.corda.nodeapi.internal.ArtemisMessagingComponent.Companion.BRIDGE_NOTIFY
+import net.corda.nodeapi.internal.ArtemisMessagingComponent.Companion.JOURNAL_HEADER_SIZE
 import net.corda.nodeapi.internal.ArtemisMessagingComponent.Companion.P2PMessagingHeaders
 import net.corda.nodeapi.internal.ArtemisMessagingComponent.Companion.PEERS_PREFIX
 import net.corda.nodeapi.internal.ArtemisMessagingComponent.NodeAddress
@@ -55,6 +56,7 @@ import net.corda.nodeapi.internal.bridging.BridgeControl
 import net.corda.nodeapi.internal.bridging.BridgeEntry
 import net.corda.nodeapi.internal.persistence.CordaPersistence
 import net.corda.nodeapi.internal.persistence.NODE_DATABASE_PREFIX
+import net.corda.nodeapi.internal.requireMessageSize
 import org.apache.activemq.artemis.api.core.ActiveMQObjectClosedException
 import org.apache.activemq.artemis.api.core.Message.HDR_DUPLICATE_DETECTION_ID
 import org.apache.activemq.artemis.api.core.Message.HDR_VALIDATED_USER
@@ -218,7 +220,7 @@ class P2PMessagingClient(val config: NodeConfiguration,
                 // would be the default and the two lines below can be deleted.
                 connectionTTL = -1
                 clientFailureCheckPeriod = -1
-                minLargeMessageSize = maxMessageSize
+                minLargeMessageSize = maxMessageSize + JOURNAL_HEADER_SIZE
                 isUseGlobalPools = nodeSerializationEnv != null
                 confirmationWindowSize = config.enterpriseConfiguration.tuning.p2pConfirmationWindowSize
             }
@@ -289,7 +291,7 @@ class P2PMessagingClient(val config: NodeConfiguration,
         networkChangeSubscription = networkMap.changed.subscribe { updateBridgesOnNetworkChange(it) }
     }
 
-     private fun sendBridgeControl(message: BridgeControl) {
+    private fun sendBridgeControl(message: BridgeControl) {
         state.locked {
             val controlPacket = message.serialize(context = SerializationDefaults.P2P_CONTEXT).bytes
             val artemisMessage = producerSession!!.createMessage(false)
@@ -397,6 +399,7 @@ class P2PMessagingClient(val config: NodeConfiguration,
 
     private fun artemisToCordaMessage(message: ClientMessage): ReceivedMessage? {
         try {
+            requireMessageSize(message.bodySize, maxMessageSize)
             val topic = message.required(P2PMessagingHeaders.topicProperty) { getStringProperty(it) }
             val user = requireNotNull(if (externalBridge) {
                 message.getStringProperty(P2PMessagingHeaders.bridgedCertificateSubject) ?: message.getStringProperty(HDR_VALIDATED_USER)
@@ -531,6 +534,7 @@ class P2PMessagingClient(val config: NodeConfiguration,
 
     @Suspendable
     override fun send(message: Message, target: MessageRecipients, retryId: Long?, sequenceKey: Any) {
+        requireMessageSize(message.data.size, maxMessageSize)
         messagingExecutor!!.send(message, target)
         retryId?.let {
             database.transaction {
@@ -586,7 +590,8 @@ class P2PMessagingClient(val config: NodeConfiguration,
         } else {
             // Otherwise we send the message to an internal queue for the target residing on our broker. It's then the
             // broker's job to route the message to the target's P2P queue.
-            val internalTargetQueue = (address as? ArtemisAddress)?.queueName ?: throw IllegalArgumentException("Not an Artemis address")
+            val internalTargetQueue = (address as? ArtemisAddress)?.queueName
+                    ?: throw IllegalArgumentException("Not an Artemis address")
             state.locked {
                 createQueueIfAbsent(internalTargetQueue, producerSession!!)
             }
diff --git a/node/src/main/kotlin/net/corda/node/services/messaging/RPCServer.kt b/node/src/main/kotlin/net/corda/node/services/messaging/RPCServer.kt
index ba3e6a4789..ddceffbe34 100644
--- a/node/src/main/kotlin/net/corda/node/services/messaging/RPCServer.kt
+++ b/node/src/main/kotlin/net/corda/node/services/messaging/RPCServer.kt
@@ -25,13 +25,14 @@ import net.corda.core.identity.CordaX500Name
 import net.corda.core.internal.LifeCycle
 import net.corda.core.messaging.RPCOps
 import net.corda.core.serialization.SerializationContext
+import net.corda.core.serialization.SerializationDefaults
 import net.corda.core.serialization.SerializationDefaults.RPC_SERVER_CONTEXT
 import net.corda.core.serialization.deserialize
 import net.corda.core.utilities.*
 import net.corda.node.internal.security.AuthorizingSubject
 import net.corda.node.internal.security.RPCSecurityManager
-import net.corda.node.serialization.kryo.RpcServerObservableSerializer
 import net.corda.node.services.logging.pushToLoggingContext
+import net.corda.node.serialization.amqp.RpcServerObservableSerializer
 import net.corda.nodeapi.RPCApi
 import net.corda.nodeapi.externalTrace
 import net.corda.nodeapi.impersonatedActor
@@ -55,6 +56,8 @@ import java.util.*
 import java.util.concurrent.*
 import kotlin.concurrent.thread
 
+private typealias ObservableSubscriptionMap = Cache<InvocationId, ObservableSubscription>
+
 data class RPCServerConfiguration(
         /** The number of threads to use for handling RPC requests */
         val rpcThreadPoolSize: Int,
@@ -416,19 +419,22 @@ class RPCServer(
 
     /*
      * We construct an observable context on each RPC request. If subsequently a nested Observable is encountered this
-     * same context is propagated by the instrumented KryoPool. This way all observations rooted in a single RPC will be
+     * same context is propagated by serialization context. This way all observations rooted in a single RPC will be
      * muxed correctly. Note that the context construction itself is quite cheap.
      */
     inner class ObservableContext(
-            val observableMap: ObservableSubscriptionMap,
-            val clientAddressToObservables: ConcurrentHashMap<SimpleString, HashSet<InvocationId>>,
-            val deduplicationIdentity: String,
-            val clientAddress: SimpleString
-    ) {
-        private val serializationContextWithObservableContext = RpcServerObservableSerializer.createContext(this)
+            override val observableMap: ObservableSubscriptionMap,
+            override val clientAddressToObservables: ConcurrentHashMap<SimpleString, HashSet<InvocationId>>,
+            override val deduplicationIdentity: String,
+            override val clientAddress: SimpleString
+    ) : ObservableContextInterface {
+        private val serializationContextWithObservableContext = RpcServerObservableSerializer.createContext(
+                observableContext = this,
+                serializationContext = SerializationDefaults.RPC_SERVER_CONTEXT)
 
-        fun sendMessage(serverToClient: RPCApi.ServerToClient) {
-            sendJobQueue.put(RpcSendJob.Send(contextDatabaseOrNull, clientAddress, serializationContextWithObservableContext, serverToClient))
+        override fun sendMessage(serverToClient: RPCApi.ServerToClient) {
+            sendJobQueue.put(RpcSendJob.Send(contextDatabaseOrNull, clientAddress,
+                    serializationContextWithObservableContext, serverToClient))
         }
     }
 
@@ -488,4 +494,4 @@ class ObservableSubscription(
         val subscription: Subscription
 )
 
-typealias ObservableSubscriptionMap = Cache<InvocationId, ObservableSubscription>
+
diff --git a/node/src/main/kotlin/net/corda/node/services/network/NodeInfoWatcher.kt b/node/src/main/kotlin/net/corda/node/services/network/NodeInfoWatcher.kt
index 44767a6d62..b032bfcca8 100644
--- a/node/src/main/kotlin/net/corda/node/services/network/NodeInfoWatcher.kt
+++ b/node/src/main/kotlin/net/corda/node/services/network/NodeInfoWatcher.kt
@@ -20,12 +20,12 @@ import net.corda.core.serialization.serialize
 import net.corda.core.utilities.contextLogger
 import net.corda.core.utilities.debug
 import net.corda.core.utilities.seconds
+import net.corda.node.serialization.amqp.AMQPServerSerializationScheme
 import net.corda.nodeapi.internal.NodeInfoAndSigned
 import net.corda.nodeapi.internal.SignedNodeInfo
 import net.corda.nodeapi.internal.network.NodeInfoFilesCopier
 import net.corda.nodeapi.internal.serialization.AMQP_P2P_CONTEXT
 import net.corda.nodeapi.internal.serialization.SerializationFactoryImpl
-import net.corda.nodeapi.internal.serialization.amqp.AMQPServerSerializationScheme
 import rx.Observable
 import rx.Scheduler
 import java.nio.file.Path
diff --git a/node/src/main/kotlin/net/corda/node/utilities/registration/NetworkRegistrationHelper.kt b/node/src/main/kotlin/net/corda/node/utilities/registration/NetworkRegistrationHelper.kt
index a18316616f..7394c92eed 100644
--- a/node/src/main/kotlin/net/corda/node/utilities/registration/NetworkRegistrationHelper.kt
+++ b/node/src/main/kotlin/net/corda/node/utilities/registration/NetworkRegistrationHelper.kt
@@ -13,6 +13,7 @@ package net.corda.node.utilities.registration
 import net.corda.core.crypto.Crypto
 import net.corda.core.identity.CordaX500Name
 import net.corda.core.internal.*
+import net.corda.core.utilities.contextLogger
 import net.corda.node.NodeRegistrationOption
 import net.corda.node.services.config.NodeConfiguration
 import net.corda.nodeapi.internal.config.SSLConfiguration
@@ -22,6 +23,7 @@ import net.corda.nodeapi.internal.crypto.X509Utilities
 import net.corda.nodeapi.internal.crypto.X509Utilities.CORDA_CLIENT_CA
 import net.corda.nodeapi.internal.crypto.X509Utilities.CORDA_CLIENT_TLS
 import net.corda.nodeapi.internal.crypto.X509Utilities.CORDA_ROOT_CA
+import org.bouncycastle.asn1.x500.X500Name
 import org.bouncycastle.openssl.jcajce.JcaPEMWriter
 import org.bouncycastle.util.io.pem.PemObject
 import java.io.StringWriter
@@ -226,6 +228,10 @@ class NodeRegistrationHelper(private val config: NodeConfiguration, certService:
                 CORDA_CLIENT_CA,
                 CertRole.NODE_CA) {
 
+    companion object {
+        val logger = contextLogger()
+    }
+
     override fun onSuccess(nodeCAKeyPair: KeyPair, certificates: List<X509Certificate>) {
         createSSLKeystore(nodeCAKeyPair, certificates)
         createTruststore(certificates.last())
@@ -240,7 +246,10 @@ class NodeRegistrationHelper(private val config: NodeConfiguration, certService:
                     certificates.first(),
                     nodeCAKeyPair,
                     config.myLegalName.x500Principal,
-                    sslKeyPair.public)
+                    sslKeyPair.public,
+                    crlDistPoint = config.tlsCertCrlDistPoint?.toString(),
+                    crlIssuer = if (config.tlsCertCrlIssuer != null) X500Name(config.tlsCertCrlIssuer) else null)
+            logger.info("Generated TLS certificate: $sslCert")
             setPrivateKey(CORDA_CLIENT_TLS, sslKeyPair.private, listOf(sslCert) + certificates)
         }
         println("SSL private key and certificate stored in ${config.sslKeystore}.")
diff --git a/node/src/test/kotlin/net/corda/node/internal/serialization/RoundTripObservableSerializerTests.kt b/node/src/test/kotlin/net/corda/node/internal/serialization/RoundTripObservableSerializerTests.kt
new file mode 100644
index 0000000000..4467a271d6
--- /dev/null
+++ b/node/src/test/kotlin/net/corda/node/internal/serialization/RoundTripObservableSerializerTests.kt
@@ -0,0 +1,101 @@
+package net.corda.node.internal.serialization
+
+import net.corda.client.rpc.internal.ObservableContext as ClientObservableContext
+import net.corda.core.internal.ThreadBox
+import net.corda.core.context.Trace
+import net.corda.node.internal.serialization.testutils.AMQPRoundTripRPCSerializationScheme
+import net.corda.node.internal.serialization.testutils.TestObservableContext as ServerObservableContext
+import net.corda.node.services.messaging.ObservableSubscription
+import net.corda.nodeapi.internal.serialization.amqp.DeserializationInput
+import net.corda.nodeapi.internal.serialization.amqp.SerializationOutput
+
+import co.paralleluniverse.common.util.SameThreadExecutor
+import com.github.benmanes.caffeine.cache.Cache
+import com.github.benmanes.caffeine.cache.Caffeine
+import com.github.benmanes.caffeine.cache.RemovalListener
+import com.nhaarman.mockito_kotlin.mock
+import net.corda.client.rpc.internal.serialization.amqp.RpcClientObservableSerializer
+import net.corda.node.internal.serialization.testutils.serializationContext
+import net.corda.node.serialization.amqp.RpcServerObservableSerializer
+import net.corda.nodeapi.RPCApi
+import org.apache.activemq.artemis.api.core.SimpleString
+import org.junit.Test
+import rx.Notification
+import rx.Observable
+import rx.Subscription
+import rx.subjects.UnicastSubject
+import java.time.Instant
+import java.util.*
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.TimeUnit
+
+class RoundTripObservableSerializerTests {
+    private fun getID() = Trace.InvocationId("test1", Instant.now())
+
+    private fun subscriptionMap(
+            id: Trace.InvocationId
+    ) : Cache<Trace.InvocationId, ObservableSubscription> {
+        val subMap: Cache<Trace.InvocationId, ObservableSubscription> = Caffeine.newBuilder().expireAfterWrite(1, TimeUnit.MINUTES)
+                .maximumSize(100)
+                .build()
+
+        subMap.put(id, ObservableSubscription(mock<Subscription>()))
+
+        return subMap
+    }
+
+    private val observablesToReap = ThreadBox(object {
+        var observables = ArrayList<Trace.InvocationId>()
+    })
+
+    private fun createRpcObservableMap(): Cache<Trace.InvocationId, UnicastSubject<Notification<*>>> {
+        val onObservableRemove = RemovalListener<Trace.InvocationId, UnicastSubject<Notification<*>>> { key, value, cause ->
+            val observableId = key!!
+
+            observablesToReap.locked { observables.add(observableId) }
+        }
+
+        return Caffeine.newBuilder().weakValues().removalListener(onObservableRemove).executor(SameThreadExecutor.getExecutor()).build()
+    }
+
+    @Test
+    fun roundTripTest1() {
+        val serializationScheme = AMQPRoundTripRPCSerializationScheme(
+                serializationContext, emptySet(), ConcurrentHashMap())
+
+        // Fake up a message ID, needs to be used on both "sides". The server setting it in the subscriptionMap,
+        // the client as a property of the deserializer which, in the actual RPC client, is pulled off of
+        // the received message
+        val id : Trace.InvocationId = getID()
+
+        val serverObservableContext = ServerObservableContext(
+                subscriptionMap(id),
+                clientAddressToObservables = ConcurrentHashMap(),
+                deduplicationIdentity = "thisIsATest",
+                clientAddress = SimpleString("clientAddress"))
+
+        val serverSerializer = serializationScheme.rpcServerSerializerFactory(serverObservableContext)
+
+        val clientObservableContext = ClientObservableContext(
+                callSiteMap = null,
+                observableMap = createRpcObservableMap(),
+                hardReferenceStore = Collections.synchronizedSet(mutableSetOf<Observable<*>>())
+        )
+
+        val clientSerializer = serializationScheme.rpcClientSerializerFactory(clientObservableContext, id)
+
+
+        // What we're actually going to serialize then deserialize
+        val obs = Observable.create<Int>({ 12 })
+
+        val serverSerializationContext = RpcServerObservableSerializer.createContext(
+                serializationContext, serverObservableContext)
+
+        val clientSerializationContext = RpcClientObservableSerializer.createContext(
+                serializationContext, clientObservableContext).withProperty(RPCApi.RpcRequestOrObservableIdKey, id)
+
+
+        val blob = SerializationOutput(serverSerializer).serialize(obs, serverSerializationContext)
+        val obs2 = DeserializationInput(clientSerializer).deserialize(blob, clientSerializationContext)
+    }
+}
\ No newline at end of file
diff --git a/node/src/test/kotlin/net/corda/node/internal/serialization/RpcServerObservableSerializerTests.kt b/node/src/test/kotlin/net/corda/node/internal/serialization/RpcServerObservableSerializerTests.kt
new file mode 100644
index 0000000000..6778a2ef91
--- /dev/null
+++ b/node/src/test/kotlin/net/corda/node/internal/serialization/RpcServerObservableSerializerTests.kt
@@ -0,0 +1,84 @@
+package net.corda.node.internal.serialization
+
+import com.github.benmanes.caffeine.cache.Cache
+import com.github.benmanes.caffeine.cache.Caffeine
+import com.nhaarman.mockito_kotlin.mock
+import net.corda.core.context.Trace
+import net.corda.node.internal.serialization.testutils.*
+import net.corda.node.serialization.amqp.RpcServerObservableSerializer
+import net.corda.node.services.messaging.ObservableSubscription
+import net.corda.nodeapi.internal.serialization.AllWhitelist
+import net.corda.nodeapi.internal.serialization.amqp.SerializationOutput
+import net.corda.nodeapi.internal.serialization.amqp.SerializerFactory
+
+import org.apache.activemq.artemis.api.core.SimpleString
+import org.junit.Test
+import rx.Observable
+import rx.Subscription
+import java.time.Instant
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.TimeUnit
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+class RpcServerObservableSerializerTests {
+
+    private fun subscriptionMap(): Cache<Trace.InvocationId, ObservableSubscription> {
+        val subMap: Cache<Trace.InvocationId, ObservableSubscription> = Caffeine.newBuilder().expireAfterWrite(1, TimeUnit.MINUTES)
+                .maximumSize(100)
+                .build()
+
+        subMap.put(Trace.InvocationId("test1", Instant.now()), ObservableSubscription(mock<Subscription>()))
+
+        return subMap
+    }
+
+    @Test
+    fun canSerializerBeRegistered() {
+        val sf = SerializerFactory(AllWhitelist, javaClass.classLoader)
+
+        try {
+            sf.register(RpcServerObservableSerializer())
+        } catch (e: Exception) {
+            throw Error("Observable serializer must be registerable with factory, unexpected exception - ${e.message}")
+        }
+    }
+
+    @Test
+    fun canAssociateWithContext() {
+        val observable = TestObservableContext(
+                subscriptionMap(),
+                clientAddressToObservables = ConcurrentHashMap(),
+                deduplicationIdentity = "thisIsATest",
+                clientAddress = SimpleString("clientAddress"))
+
+        val newContext = RpcServerObservableSerializer.createContext(serializationContext, observable)
+
+        assertEquals(1, newContext.properties.size)
+        assertTrue(newContext.properties.containsKey(RpcServerObservableSerializer.RpcObservableContextKey))
+        assertEquals(observable, newContext.properties[RpcServerObservableSerializer.RpcObservableContextKey])
+    }
+
+    @Test
+    fun serialiseFakeObservable() {
+        val testClientAddress = "clientAddres"
+        val observable = TestObservableContext(
+                subscriptionMap(),
+                clientAddressToObservables = ConcurrentHashMap(),
+                deduplicationIdentity = "thisIsATest",
+                clientAddress = SimpleString(testClientAddress))
+
+        val sf = SerializerFactory(AllWhitelist, javaClass.classLoader).apply {
+            register(RpcServerObservableSerializer())
+        }
+
+        val obs = Observable.create<Int>({ 12 })
+        val newContext = RpcServerObservableSerializer.createContext(serializationContext, observable)
+
+        try {
+            SerializationOutput(sf).serializeAndReturnSchema(obs, newContext)
+        } catch (e: Exception) {
+            throw Error("Serialization of observable should not throw - ${e.message}")
+        }
+    }
+}
\ No newline at end of file
diff --git a/node/src/test/kotlin/net/corda/node/internal/serialization/testutils/AMQPTestSerialiationScheme.kt b/node/src/test/kotlin/net/corda/node/internal/serialization/testutils/AMQPTestSerialiationScheme.kt
new file mode 100644
index 0000000000..73a48147ba
--- /dev/null
+++ b/node/src/test/kotlin/net/corda/node/internal/serialization/testutils/AMQPTestSerialiationScheme.kt
@@ -0,0 +1,55 @@
+package net.corda.node.internal.serialization.testutils
+
+import net.corda.client.rpc.internal.serialization.amqp.RpcClientObservableSerializer
+import net.corda.core.context.Trace
+import net.corda.core.cordapp.Cordapp
+import net.corda.core.serialization.ClassWhitelist
+import net.corda.core.serialization.SerializationContext
+import net.corda.core.serialization.SerializationCustomSerializer
+import net.corda.node.serialization.amqp.RpcServerObservableSerializer
+import net.corda.nodeapi.RPCApi
+import net.corda.nodeapi.internal.serialization.AllWhitelist
+import net.corda.nodeapi.internal.serialization.CordaSerializationMagic
+import net.corda.nodeapi.internal.serialization.amqp.AbstractAMQPSerializationScheme
+import net.corda.nodeapi.internal.serialization.amqp.SerializerFactory
+import java.util.concurrent.ConcurrentHashMap
+import net.corda.client.rpc.internal.ObservableContext as ClientObservableContext
+
+/**
+ * Special serialization context for the round trip tests that allows for both server and client RPC
+ * operations
+ */
+
+
+class AMQPRoundTripRPCSerializationScheme(
+        private val serializationContext: SerializationContext,
+        cordappCustomSerializers: Set<SerializationCustomSerializer<*, *>>,
+        serializerFactoriesForContexts: MutableMap<Pair<ClassWhitelist, ClassLoader>, SerializerFactory>)
+    : AbstractAMQPSerializationScheme(
+        cordappCustomSerializers, serializerFactoriesForContexts
+) {
+    override fun rpcClientSerializerFactory(context: SerializationContext): SerializerFactory {
+        return SerializerFactory(AllWhitelist, javaClass.classLoader).apply {
+            register(RpcClientObservableSerializer)
+        }
+    }
+
+    override fun rpcServerSerializerFactory(context: SerializationContext): SerializerFactory {
+        return SerializerFactory(AllWhitelist, javaClass.classLoader).apply {
+            register(RpcServerObservableSerializer())
+        }
+    }
+
+    override fun canDeserializeVersion(
+            magic: CordaSerializationMagic,
+            target: SerializationContext.UseCase) = true
+
+    fun rpcClientSerializerFactory(observableContext: ClientObservableContext, id: Trace.InvocationId) =
+            rpcClientSerializerFactory(
+                    RpcClientObservableSerializer.createContext(serializationContext, observableContext)
+                        .withProperty(RPCApi.RpcRequestOrObservableIdKey, id))
+
+    fun rpcServerSerializerFactory(observableContext: TestObservableContext) =
+            rpcServerSerializerFactory(
+                    RpcServerObservableSerializer.createContext(serializationContext, observableContext))
+}
\ No newline at end of file
diff --git a/node/src/test/kotlin/net/corda/node/internal/serialization/testutils/TestObservableContext.kt b/node/src/test/kotlin/net/corda/node/internal/serialization/testutils/TestObservableContext.kt
new file mode 100644
index 0000000000..cbfcaa8f5c
--- /dev/null
+++ b/node/src/test/kotlin/net/corda/node/internal/serialization/testutils/TestObservableContext.kt
@@ -0,0 +1,18 @@
+package net.corda.node.internal.serialization.testutils
+
+import com.github.benmanes.caffeine.cache.Cache
+import net.corda.core.context.Trace
+import net.corda.node.services.messaging.ObservableContextInterface
+import net.corda.node.services.messaging.ObservableSubscription
+import net.corda.nodeapi.RPCApi
+import org.apache.activemq.artemis.api.core.SimpleString
+import java.util.concurrent.ConcurrentHashMap
+
+class TestObservableContext(
+        override val observableMap: Cache<Trace.InvocationId, ObservableSubscription>,
+        override val clientAddressToObservables: ConcurrentHashMap<SimpleString, HashSet<Trace.InvocationId>>,
+        override val deduplicationIdentity: String,
+        override val clientAddress: SimpleString
+) : ObservableContextInterface {
+    override fun sendMessage(serverToClient: RPCApi.ServerToClient) { }
+}
\ No newline at end of file
diff --git a/node/src/test/kotlin/net/corda/node/internal/serialization/testutils/TestSerializationContext.kt b/node/src/test/kotlin/net/corda/node/internal/serialization/testutils/TestSerializationContext.kt
new file mode 100644
index 0000000000..54ad5e55ba
--- /dev/null
+++ b/node/src/test/kotlin/net/corda/node/internal/serialization/testutils/TestSerializationContext.kt
@@ -0,0 +1,17 @@
+package net.corda.node.internal.serialization.testutils
+
+import net.corda.core.serialization.SerializationContext
+import net.corda.nodeapi.internal.serialization.AllWhitelist
+import net.corda.nodeapi.internal.serialization.SerializationContextImpl
+import net.corda.nodeapi.internal.serialization.amqp.amqpMagic
+
+val serializationProperties: MutableMap<Any, Any> = mutableMapOf()
+
+val serializationContext = SerializationContextImpl(
+        preferredSerializationVersion = amqpMagic,
+        deserializationClassLoader = ClassLoader.getSystemClassLoader(),
+        whitelist = AllWhitelist,
+        properties = serializationProperties,
+        objectReferencesEnabled = false,
+        useCase = SerializationContext.UseCase.Testing,
+        encoding = null)
\ No newline at end of file
diff --git a/node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt b/node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
index 320591dcbf..e6c76aa71f 100644
--- a/node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
+++ b/node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
@@ -25,6 +25,7 @@ import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.junit.Test
 import java.net.URI
+import java.net.URL
 import java.nio.file.Paths
 import java.util.*
 import kotlin.test.assertEquals
@@ -42,6 +43,27 @@ class NodeConfigurationImplTest {
         configDebugOptions(false, null)
     }
 
+    @Test
+    fun `can't have tlsCertCrlDistPoint null when tlsCertCrlIssuer is given`() {
+        val configValidationResult = configTlsCertCrlOptions(null, "C=US, L=New York, OU=Corda, O=R3 HoldCo LLC, CN=Corda Root CA").validate()
+        assertTrue { configValidationResult.isNotEmpty() }
+        assertThat(configValidationResult.first()).contains("tlsCertCrlDistPoint needs to be specified when tlsCertCrlIssuer is not NULL")
+    }
+
+    @Test
+    fun `tlsCertCrlIssuer validation fails when misconfigured`() {
+        val configValidationResult = configTlsCertCrlOptions(URL("http://test.com/crl"), "Corda Root CA").validate()
+        assertTrue { configValidationResult.isNotEmpty() }
+        assertThat(configValidationResult.first()).contains("Error when parsing tlsCertCrlIssuer:")
+    }
+
+    @Test
+    fun `can't have tlsCertCrlDistPoint null when crlCheckSoftFail is false`() {
+        val configValidationResult = configTlsCertCrlOptions(null, null, false).validate()
+        assertTrue { configValidationResult.isNotEmpty() }
+        assertThat(configValidationResult.first()).contains("tlsCertCrlDistPoint needs to be specified when crlCheckSoftFail is FALSE")
+    }
+
     @Test
     fun `check devModeOptions flag helper`() {
         assertTrue { configDebugOptions(true, null).shouldCheckCheckpoints() }
@@ -155,6 +177,10 @@ class NodeConfigurationImplTest {
         return testConfiguration.copy(devMode = devMode, devModeOptions = devModeOptions)
     }
 
+    private fun configTlsCertCrlOptions(tlsCertCrlDistPoint: URL?, tlsCertCrlIssuer: String?, crlCheckSoftFail: Boolean = true): NodeConfiguration {
+        return testConfiguration.copy(tlsCertCrlDistPoint = tlsCertCrlDistPoint, tlsCertCrlIssuer = tlsCertCrlIssuer, crlCheckSoftFail = crlCheckSoftFail)
+    }
+
     private fun testConfiguration(dataSourceProperties: Properties): NodeConfigurationImpl {
         return testConfiguration.copy(dataSourceProperties = dataSourceProperties)
     }
@@ -190,7 +216,8 @@ class NodeConfigurationImplTest {
                 rpcSettings = rpcSettings,
                 relay = null,
                 enterpriseConfiguration = EnterpriseConfiguration((MutualExclusionConfiguration(false, "", 20000, 40000))),
-                crlCheckSoftFail = true
+                crlCheckSoftFail = true,
+                tlsCertCrlDistPoint = null
         )
     }
 }
diff --git a/node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt b/node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
index 3634979edf..3c9fd7fa9a 100644
--- a/node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
+++ b/node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
@@ -35,6 +35,7 @@ import net.corda.testing.node.MockServices.Companion.makeTestDataSourcePropertie
 import net.corda.testing.node.internal.MOCK_VERSION_INFO
 import org.apache.activemq.artemis.api.core.Message.HDR_VALIDATED_USER
 import org.apache.activemq.artemis.api.core.SimpleString
+import org.apache.activemq.artemis.api.core.ActiveMQConnectionTimedOutException
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.junit.After
@@ -50,6 +51,7 @@ import java.util.concurrent.TimeUnit.MILLISECONDS
 import kotlin.concurrent.thread
 import kotlin.test.assertEquals
 import kotlin.test.assertNull
+import kotlin.test.assertTrue
 
 class ArtemisMessagingTest {
     companion object {
@@ -86,7 +88,8 @@ class ArtemisMessagingTest {
             doReturn(null).whenever(it).jmxMonitoringHttpPort
             doReturn(emptyList<CertChainPolicyConfig>()).whenever(it).certificateChainCheckPolicies
             doReturn(EnterpriseConfiguration(MutualExclusionConfiguration(false, "", 20000, 40000))).whenever(it).enterpriseConfiguration
-            doReturn(P2PMessagingRetryConfiguration(5.seconds, 3, backoffBase=1.0)).whenever(it).p2pMessagingRetry
+            doReturn(P2PMessagingRetryConfiguration(5.seconds, 3, backoffBase = 1.0)).whenever(it).p2pMessagingRetry
+
         }
         LogHelper.setLevel(PersistentUniquenessProvider::class)
         database = configureDatabase(makeTestDataSourceProperties(), DatabaseConfig(runMigration = true), rigorousMock())
@@ -148,6 +151,41 @@ class ArtemisMessagingTest {
         assertNull(receivedMessages.poll(200, MILLISECONDS))
     }
 
+    @Test
+    fun `client should fail if message exceed maxMessageSize limit`() {
+        val (messagingClient, receivedMessages) = createAndStartClientAndServer()
+        val message = messagingClient.createMessage(TOPIC, data = ByteArray(MAX_MESSAGE_SIZE))
+        messagingClient.send(message, messagingClient.myAddress)
+
+        val actual: Message = receivedMessages.take()
+        assertTrue(ByteArray(MAX_MESSAGE_SIZE).contentEquals(actual.data.bytes))
+        assertNull(receivedMessages.poll(200, MILLISECONDS))
+
+        val tooLagerMessage = messagingClient.createMessage(TOPIC, data = ByteArray(MAX_MESSAGE_SIZE + 1))
+        assertThatThrownBy {
+            messagingClient.send(tooLagerMessage, messagingClient.myAddress)
+        }.isInstanceOf(IllegalArgumentException::class.java)
+                .hasMessageContaining("Message exceeds maxMessageSize network parameter")
+
+        assertNull(receivedMessages.poll(200, MILLISECONDS))
+    }
+    @Test
+    fun `server should not process if incoming message exceed maxMessageSize limit`() {
+        val (messagingClient, receivedMessages) = createAndStartClientAndServer(clientMaxMessageSize = 100_000, serverMaxMessageSize = 50_000)
+        val message = messagingClient.createMessage(TOPIC, data = ByteArray(50_000))
+        messagingClient.send(message, messagingClient.myAddress)
+
+        val actual: Message = receivedMessages.take()
+        assertTrue(ByteArray(50_000).contentEquals(actual.data.bytes))
+        assertNull(receivedMessages.poll(200, MILLISECONDS))
+
+        val tooLagerMessage = messagingClient.createMessage(TOPIC, data = ByteArray(100_000))
+        assertThatThrownBy {
+            messagingClient.send(tooLagerMessage, messagingClient.myAddress)
+        }.isInstanceOf(ActiveMQConnectionTimedOutException::class.java)
+        assertNull(receivedMessages.poll(200, MILLISECONDS))
+    }
+
     @Test
     fun `platform version is included in the message`() {
         val (messagingClient, receivedMessages) = createAndStartClientAndServer(platformVersion = 3)
@@ -325,12 +363,15 @@ class ArtemisMessagingTest {
         messagingClient!!.start()
     }
 
-    private fun createAndStartClientAndServer(platformVersion: Int = 1, dontAckCondition: (msg: ReceivedMessage) -> Boolean = { false }): Pair<P2PMessagingClient, BlockingQueue<ReceivedMessage>> {
+    private fun createAndStartClientAndServer(platformVersion: Int = 1, serverMaxMessageSize: Int = MAX_MESSAGE_SIZE,
+                                              clientMaxMessageSize: Int = MAX_MESSAGE_SIZE,
+                                              dontAckCondition: (msg: ReceivedMessage) -> Boolean = { false }
+    ): Pair<P2PMessagingClient, BlockingQueue<ReceivedMessage>> {
         val receivedMessages = LinkedBlockingQueue<ReceivedMessage>()
 
-        createMessagingServer().start()
+        createMessagingServer(maxMessageSize = serverMaxMessageSize).start()
 
-        val messagingClient = createMessagingClient(platformVersion = platformVersion)
+        val messagingClient = createMessagingClient(platformVersion = platformVersion, maxMessageSize = clientMaxMessageSize)
         messagingClient.addMessageHandler(TOPIC) { message, _, handle ->
             if (dontAckCondition(message)) return@addMessageHandler
             database.transaction { handle.insideDatabaseTransaction() }
diff --git a/node/src/test/kotlin/net/corda/node/utilities/registration/NetworkRegistrationHelperTest.kt b/node/src/test/kotlin/net/corda/node/utilities/registration/NetworkRegistrationHelperTest.kt
index 1e70b77eb8..a08bae3f05 100644
--- a/node/src/test/kotlin/net/corda/node/utilities/registration/NetworkRegistrationHelperTest.kt
+++ b/node/src/test/kotlin/net/corda/node/utilities/registration/NetworkRegistrationHelperTest.kt
@@ -68,6 +68,8 @@ class NetworkRegistrationHelperTest {
             doReturn("cordacadevpass").whenever(it).keyStorePassword
             doReturn(nodeLegalName).whenever(it).myLegalName
             doReturn("").whenever(it).emailAddress
+            doReturn(null).whenever(it).tlsCertCrlDistPoint
+            doReturn(null).whenever(it).tlsCertCrlIssuer
         }
     }
 
diff --git a/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/RPCDriver.kt b/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/RPCDriver.kt
index 643c140102..183c68340f 100644
--- a/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/RPCDriver.kt
+++ b/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/RPCDriver.kt
@@ -11,9 +11,9 @@
 package net.corda.testing.node.internal
 
 import net.corda.client.mock.Generator
-import net.corda.client.rpc.internal.serialization.kryo.KryoClientSerializationScheme
 import net.corda.client.rpc.internal.RPCClient
 import net.corda.client.rpc.internal.CordaRPCClientConfigurationImpl
+import net.corda.client.rpc.internal.serialization.amqp.AMQPClientSerializationScheme
 import net.corda.core.concurrent.CordaFuture
 import net.corda.core.context.AuthServiceId
 import net.corda.core.context.Trace
@@ -33,7 +33,7 @@ import net.corda.node.services.messaging.RPCServerConfiguration
 import net.corda.nodeapi.ArtemisTcpTransport
 import net.corda.nodeapi.ConnectionDirection
 import net.corda.nodeapi.RPCApi
-import net.corda.nodeapi.internal.serialization.KRYO_RPC_CLIENT_CONTEXT
+import net.corda.nodeapi.internal.serialization.AMQP_RPC_CLIENT_CONTEXT
 import net.corda.testing.common.internal.testNetworkParameters
 import net.corda.testing.core.MAX_MESSAGE_SIZE
 import net.corda.testing.driver.JmxPolicy
@@ -523,8 +523,8 @@ class RandomRpcUser {
             val hostAndPort = NetworkHostAndPort.parse(args[1])
             val username = args[2]
             val password = args[3]
-            KryoClientSerializationScheme.initialiseSerialization()
-            val handle = RPCClient<RPCOps>(hostAndPort, null, serializationContext = KRYO_RPC_CLIENT_CONTEXT).start(rpcClass, username, password)
+            AMQPClientSerializationScheme.initialiseSerialization()
+            val handle = RPCClient<RPCOps>(hostAndPort, null, serializationContext = AMQP_RPC_CLIENT_CONTEXT).start(rpcClass, username, password)
             val callGenerators = rpcClass.declaredMethods.map { method ->
                 Generator.sequence(method.parameters.map {
                     generatorStore[it.type] ?: throw Exception("No generator for ${it.type}")
diff --git a/testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeProcess.kt b/testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeProcess.kt
index 8504c7ecd5..6d92fe9bfd 100644
--- a/testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeProcess.kt
+++ b/testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeProcess.kt
@@ -12,7 +12,7 @@ package net.corda.smoketesting
 
 import net.corda.client.rpc.CordaRPCClient
 import net.corda.client.rpc.CordaRPCConnection
-import net.corda.client.rpc.internal.serialization.kryo.KryoClientSerializationScheme
+import net.corda.client.rpc.internal.serialization.amqp.AMQPClientSerializationScheme
 import net.corda.core.internal.*
 import net.corda.core.utilities.NetworkHostAndPort
 import net.corda.core.utilities.contextLogger
@@ -74,7 +74,7 @@ class NodeProcess(
             val javaPath: Path = Paths.get(System.getProperty("java.home"), "bin", "java")
             val formatter: DateTimeFormatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss").withZone(systemDefault())
             val defaultNetworkParameters = run {
-                KryoClientSerializationScheme.createSerializationEnv().asContextEnv {
+                AMQPClientSerializationScheme.createSerializationEnv().asContextEnv {
                     // There are no notaries in the network parameters for smoke test nodes. If this is required then we would
                     // need to introduce the concept of a "network" which predefines the notaries, like the driver and MockNetwork
                     NetworkParametersCopier(testNetworkParameters())
diff --git a/testing/test-utils/src/main/kotlin/net/corda/testing/core/SerializationTestHelpers.kt b/testing/test-utils/src/main/kotlin/net/corda/testing/core/SerializationTestHelpers.kt
index 6aadfd9642..770da55b75 100644
--- a/testing/test-utils/src/main/kotlin/net/corda/testing/core/SerializationTestHelpers.kt
+++ b/testing/test-utils/src/main/kotlin/net/corda/testing/core/SerializationTestHelpers.kt
@@ -13,6 +13,7 @@ package net.corda.testing.core
 import com.nhaarman.mockito_kotlin.any
 import com.nhaarman.mockito_kotlin.doAnswer
 import com.nhaarman.mockito_kotlin.whenever
+import net.corda.core.DoNotImplement
 import net.corda.core.internal.staticField
 import net.corda.core.serialization.internal.SerializationEnvironment
 import net.corda.core.serialization.internal.effectiveSerializationEnv
diff --git a/testing/test-utils/src/main/kotlin/net/corda/testing/internal/InternalSerializationTestHelpers.kt b/testing/test-utils/src/main/kotlin/net/corda/testing/internal/InternalSerializationTestHelpers.kt
index 03f06bfd56..81a4f50b71 100644
--- a/testing/test-utils/src/main/kotlin/net/corda/testing/internal/InternalSerializationTestHelpers.kt
+++ b/testing/test-utils/src/main/kotlin/net/corda/testing/internal/InternalSerializationTestHelpers.kt
@@ -12,13 +12,12 @@ package net.corda.testing.internal
 
 import com.nhaarman.mockito_kotlin.doNothing
 import com.nhaarman.mockito_kotlin.whenever
-import net.corda.client.rpc.internal.serialization.kryo.KryoClientSerializationScheme
 import net.corda.core.DoNotImplement
+import net.corda.client.rpc.internal.serialization.amqp.AMQPClientSerializationScheme
 import net.corda.core.serialization.internal.*
+import net.corda.node.serialization.amqp.AMQPServerSerializationScheme
 import net.corda.node.serialization.kryo.KryoServerSerializationScheme
 import net.corda.nodeapi.internal.serialization.*
-import net.corda.nodeapi.internal.serialization.amqp.AMQPClientSerializationScheme
-import net.corda.nodeapi.internal.serialization.amqp.AMQPServerSerializationScheme
 import net.corda.testing.core.SerializationEnvironmentRule
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.ExecutorService
@@ -41,16 +40,16 @@ fun <T> withoutTestSerialization(callable: () -> T): T { // TODO: Delete this, s
 
 internal fun createTestSerializationEnv(label: String): SerializationEnvironmentImpl {
     val factory = SerializationFactoryImpl().apply {
-        registerScheme(KryoClientSerializationScheme())
-        registerScheme(KryoServerSerializationScheme())
         registerScheme(AMQPClientSerializationScheme(emptyList()))
         registerScheme(AMQPServerSerializationScheme(emptyList()))
+        // needed for checkpointing
+        registerScheme(KryoServerSerializationScheme())
     }
     return object : SerializationEnvironmentImpl(
             factory,
             AMQP_P2P_CONTEXT,
-            KRYO_RPC_SERVER_CONTEXT,
-            KRYO_RPC_CLIENT_CONTEXT,
+            AMQP_RPC_SERVER_CONTEXT,
+            AMQP_RPC_CLIENT_CONTEXT,
             AMQP_STORAGE_CONTEXT,
             KRYO_CHECKPOINT_CONTEXT
     ) {
diff --git a/tools/demobench/build.gradle b/tools/demobench/build.gradle
index 6e192933d9..30be478ab1 100644
--- a/tools/demobench/build.gradle
+++ b/tools/demobench/build.gradle
@@ -32,6 +32,7 @@ apply plugin: 'kotlin'
 apply plugin: 'application'
 
 evaluationDependsOn(':tools:explorer:capsule')
+evaluationDependsOn(':webserver:webcapsule')
 
 mainClassName = 'net.corda.demobench.DemoBench'
 applicationDefaultJvmArgs = [
diff --git a/tools/demobench/src/main/kotlin/net/corda/demobench/DemoBench.kt b/tools/demobench/src/main/kotlin/net/corda/demobench/DemoBench.kt
index 04a6de243b..319465fab6 100644
--- a/tools/demobench/src/main/kotlin/net/corda/demobench/DemoBench.kt
+++ b/tools/demobench/src/main/kotlin/net/corda/demobench/DemoBench.kt
@@ -11,13 +11,12 @@
 package net.corda.demobench
 
 import javafx.scene.image.Image
-import net.corda.client.rpc.internal.serialization.kryo.KryoClientSerializationScheme
+import net.corda.client.rpc.internal.serialization.amqp.AMQPClientSerializationScheme
 import net.corda.core.serialization.internal.SerializationEnvironmentImpl
 import net.corda.core.serialization.internal.nodeSerializationEnv
 import net.corda.demobench.views.DemoBenchView
 import net.corda.nodeapi.internal.serialization.AMQP_P2P_CONTEXT
 import net.corda.nodeapi.internal.serialization.SerializationFactoryImpl
-import net.corda.nodeapi.internal.serialization.amqp.AMQPClientSerializationScheme
 import tornadofx.*
 import java.io.InputStreamReader
 import java.nio.charset.StandardCharsets.UTF_8
@@ -69,8 +68,7 @@ class DemoBench : App(DemoBenchView::class) {
     private fun initialiseSerialization() {
         nodeSerializationEnv = SerializationEnvironmentImpl(
                 SerializationFactoryImpl().apply {
-                    registerScheme(KryoClientSerializationScheme())
-                    registerScheme(AMQPClientSerializationScheme())
+                    registerScheme(AMQPClientSerializationScheme(emptyList()))
                 },
                 AMQP_P2P_CONTEXT)
     }
diff --git a/tools/shell/src/integration-test/kotlin/net/corda/tools/shell/SSHServerTest.kt b/tools/shell/src/integration-test/kotlin/net/corda/tools/shell/SSHServerTest.kt
index cc69f2daa3..2e7ea5324f 100644
--- a/tools/shell/src/integration-test/kotlin/net/corda/tools/shell/SSHServerTest.kt
+++ b/tools/shell/src/integration-test/kotlin/net/corda/tools/shell/SSHServerTest.kt
@@ -37,6 +37,7 @@ import org.bouncycastle.util.io.Streams
 import org.junit.ClassRule
 import org.junit.Ignore
 import org.junit.Test
+import java.lang.Thread.sleep
 import java.net.ConnectException
 import kotlin.test.assertTrue
 import kotlin.test.fail
@@ -75,7 +76,7 @@ class SSHServerTest : IntegrationTest() {
         // The driver will automatically pick up the annotated flows below
         driver {
             val node = startNode(providedName = ALICE_NAME, rpcUsers = listOf(user),
-                    customOverrides = mapOf("sshd" to mapOf("port" to 2222)))
+                    customOverrides = mapOf("sshd" to mapOf("port" to 2222)) /*, startInSameProcess = true */)
             node.getOrThrow()
 
             val session = JSch().getSession("u", "localhost", 2222)