diff --git a/node-schemas/build/generated/source/kapt/main/net/corda/node/services/vault/schemas/Models.java b/node-schemas/build/generated/source/kapt/main/net/corda/node/services/vault/schemas/Models.java
new file mode 100644
index 0000000000..199b5265ac
--- /dev/null
+++ b/node-schemas/build/generated/source/kapt/main/net/corda/node/services/vault/schemas/Models.java
@@ -0,0 +1,18 @@
+// Generated file do not edit, generated by io.requery.processor.EntityProcessor
+package net.corda.node.services.vault.schemas;
+
+import io.requery.meta.EntityModel;
+import io.requery.meta.EntityModelBuilder;
+import javax.annotation.Generated;
+
+@Generated("io.requery.processor.EntityProcessor")
+public class Models {
+    public static final EntityModel VAULT = new EntityModelBuilder("vault")
+    .addType(VaultTxnNoteEntity.$TYPE)
+    .addType(VaultCashBalancesEntity.$TYPE)
+    .addType(VaultStatesEntity.$TYPE)
+    .build();
+
+    private Models() {
+    }
+}
diff --git a/node-schemas/build/generated/source/kapt/main/net/corda/node/services/vault/schemas/VaultCashBalancesEntity.java b/node-schemas/build/generated/source/kapt/main/net/corda/node/services/vault/schemas/VaultCashBalancesEntity.java
new file mode 100644
index 0000000000..64e2013324
--- /dev/null
+++ b/node-schemas/build/generated/source/kapt/main/net/corda/node/services/vault/schemas/VaultCashBalancesEntity.java
@@ -0,0 +1,167 @@
+// Generated file do not edit, generated by io.requery.processor.EntityProcessor
+package net.corda.node.services.vault.schemas;
+
+import io.requery.Persistable;
+import io.requery.meta.AttributeBuilder;
+import io.requery.meta.AttributeDelegate;
+import io.requery.meta.Type;
+import io.requery.meta.TypeBuilder;
+import io.requery.proxy.EntityProxy;
+import io.requery.proxy.LongProperty;
+import io.requery.proxy.Property;
+import io.requery.proxy.PropertyState;
+import io.requery.util.function.Function;
+import io.requery.util.function.Supplier;
+import java.lang.Long;
+import java.lang.Object;
+import java.lang.Override;
+import java.lang.String;
+import javax.annotation.Generated;
+
+@Generated("io.requery.processor.EntityProcessor")
+public class VaultCashBalancesEntity implements VaultSchema.VaultCashBalances, Persistable {
+    public static final AttributeDelegate<VaultCashBalancesEntity, String> CURRENCY = new AttributeDelegate(
+    new AttributeBuilder<VaultCashBalancesEntity, String>("currency_code", String.class)
+    .setProperty(new Property<VaultCashBalancesEntity, String>() {
+        @Override
+        public String get(VaultCashBalancesEntity entity) {
+            return entity.currency;
+        }
+
+        @Override
+        public void set(VaultCashBalancesEntity entity, String value) {
+            entity.currency = value;
+        }
+    })
+    .setPropertyName("getCurrency")
+    .setPropertyState(new Property<VaultCashBalancesEntity, PropertyState>() {
+        @Override
+        public PropertyState get(VaultCashBalancesEntity entity) {
+            return entity.$currency_state;
+        }
+
+        @Override
+        public void set(VaultCashBalancesEntity entity, PropertyState value) {
+            entity.$currency_state = value;
+        }
+    })
+    .setKey(true)
+    .setGenerated(false)
+    .setLazy(false)
+    .setNullable(true)
+    .setUnique(false)
+    .setLength(3)
+    .build());
+
+    public static final AttributeDelegate<VaultCashBalancesEntity, Long> AMOUNT = new AttributeDelegate(
+    new AttributeBuilder<VaultCashBalancesEntity, Long>("amount", long.class)
+    .setProperty(new LongProperty<VaultCashBalancesEntity>() {
+        @Override
+        public Long get(VaultCashBalancesEntity entity) {
+            return entity.amount;
+        }
+
+        @Override
+        public void set(VaultCashBalancesEntity entity, Long value) {
+            if(value != null) {
+                entity.amount = value;
+            }
+        }
+
+        @Override
+        public long getLong(VaultCashBalancesEntity entity) {
+            return entity.amount;
+        }
+
+        @Override
+        public void setLong(VaultCashBalancesEntity entity, long value) {
+            entity.amount = value;
+        }
+    })
+    .setPropertyName("getAmount")
+    .setPropertyState(new Property<VaultCashBalancesEntity, PropertyState>() {
+        @Override
+        public PropertyState get(VaultCashBalancesEntity entity) {
+            return entity.$amount_state;
+        }
+
+        @Override
+        public void set(VaultCashBalancesEntity entity, PropertyState value) {
+            entity.$amount_state = value;
+        }
+    })
+    .setGenerated(false)
+    .setLazy(false)
+    .setNullable(true)
+    .setUnique(false)
+    .setDefaultValue("0")
+    .build());
+
+    public static final Type<VaultCashBalancesEntity> $TYPE = new TypeBuilder<VaultCashBalancesEntity>(VaultCashBalancesEntity.class, "vault_cash_balances")
+    .setBaseType(VaultSchema.VaultCashBalances.class)
+    .setCacheable(true)
+    .setImmutable(false)
+    .setReadOnly(false)
+    .setStateless(false)
+    .setFactory(new Supplier<VaultCashBalancesEntity>() {
+        @Override
+        public VaultCashBalancesEntity get() {
+            return new VaultCashBalancesEntity();
+        }
+    })
+    .setProxyProvider(new Function<VaultCashBalancesEntity, EntityProxy<VaultCashBalancesEntity>>() {
+        @Override
+        public EntityProxy<VaultCashBalancesEntity> apply(VaultCashBalancesEntity entity) {
+            return entity.$proxy;
+        }
+    })
+    .addAttribute(CURRENCY)
+    .addAttribute(AMOUNT)
+    .build();
+
+    private PropertyState $currency_state;
+
+    private PropertyState $amount_state;
+
+    private String currency;
+
+    private long amount;
+
+    private final transient EntityProxy<VaultCashBalancesEntity> $proxy = new EntityProxy<VaultCashBalancesEntity>(this, $TYPE);
+
+    public VaultCashBalancesEntity() {
+    }
+
+    @Override
+    public String getCurrency() {
+        return $proxy.get(CURRENCY);
+    }
+
+    public void setCurrency(String currency) {
+        $proxy.set(CURRENCY, currency);
+    }
+
+    @Override
+    public long getAmount() {
+        return $proxy.get(AMOUNT);
+    }
+
+    public void setAmount(long amount) {
+        $proxy.set(AMOUNT, amount);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof VaultCashBalancesEntity && ((VaultCashBalancesEntity)obj).$proxy.equals(this.$proxy);
+    }
+
+    @Override
+    public int hashCode() {
+        return $proxy.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return $proxy.toString();
+    }
+}
diff --git a/node-schemas/build/generated/source/kapt/main/net/corda/node/services/vault/schemas/VaultStatesEntity.java b/node-schemas/build/generated/source/kapt/main/net/corda/node/services/vault/schemas/VaultStatesEntity.java
new file mode 100644
index 0000000000..def225c344
--- /dev/null
+++ b/node-schemas/build/generated/source/kapt/main/net/corda/node/services/vault/schemas/VaultStatesEntity.java
@@ -0,0 +1,574 @@
+// Generated file do not edit, generated by io.requery.processor.EntityProcessor
+package net.corda.node.services.vault.schemas;
+
+import io.requery.Persistable;
+import io.requery.meta.AttributeBuilder;
+import io.requery.meta.AttributeDelegate;
+import io.requery.meta.Type;
+import io.requery.meta.TypeBuilder;
+import io.requery.proxy.EntityProxy;
+import io.requery.proxy.IntProperty;
+import io.requery.proxy.Property;
+import io.requery.proxy.PropertyState;
+import io.requery.util.function.Function;
+import io.requery.util.function.Supplier;
+import java.lang.Integer;
+import java.lang.Object;
+import java.lang.Override;
+import java.lang.String;
+import java.time.Instant;
+import javax.annotation.Generated;
+import net.corda.core.node.services.Vault;
+
+@Generated("io.requery.processor.EntityProcessor")
+public class VaultStatesEntity implements VaultSchema.VaultStates, Persistable {
+    public static final AttributeDelegate<VaultStatesEntity, String> NOTARY_NAME = new AttributeDelegate(
+    new AttributeBuilder<VaultStatesEntity, String>("notary_name", String.class)
+    .setProperty(new Property<VaultStatesEntity, String>() {
+        @Override
+        public String get(VaultStatesEntity entity) {
+            return entity.notaryName;
+        }
+
+        @Override
+        public void set(VaultStatesEntity entity, String value) {
+            entity.notaryName = value;
+        }
+    })
+    .setPropertyName("getNotaryName")
+    .setPropertyState(new Property<VaultStatesEntity, PropertyState>() {
+        @Override
+        public PropertyState get(VaultStatesEntity entity) {
+            return entity.$notaryName_state;
+        }
+
+        @Override
+        public void set(VaultStatesEntity entity, PropertyState value) {
+            entity.$notaryName_state = value;
+        }
+    })
+    .setGenerated(false)
+    .setLazy(false)
+    .setNullable(true)
+    .setUnique(false)
+    .build());
+
+    public static final AttributeDelegate<VaultStatesEntity, String> NOTARY_KEY = new AttributeDelegate(
+    new AttributeBuilder<VaultStatesEntity, String>("notary_key", String.class)
+    .setProperty(new Property<VaultStatesEntity, String>() {
+        @Override
+        public String get(VaultStatesEntity entity) {
+            return entity.notaryKey;
+        }
+
+        @Override
+        public void set(VaultStatesEntity entity, String value) {
+            entity.notaryKey = value;
+        }
+    })
+    .setPropertyName("getNotaryKey")
+    .setPropertyState(new Property<VaultStatesEntity, PropertyState>() {
+        @Override
+        public PropertyState get(VaultStatesEntity entity) {
+            return entity.$notaryKey_state;
+        }
+
+        @Override
+        public void set(VaultStatesEntity entity, PropertyState value) {
+            entity.$notaryKey_state = value;
+        }
+    })
+    .setGenerated(false)
+    .setLazy(false)
+    .setNullable(true)
+    .setUnique(false)
+    .build());
+
+    public static final AttributeDelegate<VaultStatesEntity, String> CONTRACT_STATE_CLASS_NAME = new AttributeDelegate(
+    new AttributeBuilder<VaultStatesEntity, String>("contract_state_class_name", String.class)
+    .setProperty(new Property<VaultStatesEntity, String>() {
+        @Override
+        public String get(VaultStatesEntity entity) {
+            return entity.contractStateClassName;
+        }
+
+        @Override
+        public void set(VaultStatesEntity entity, String value) {
+            entity.contractStateClassName = value;
+        }
+    })
+    .setPropertyName("getContractStateClassName")
+    .setPropertyState(new Property<VaultStatesEntity, PropertyState>() {
+        @Override
+        public PropertyState get(VaultStatesEntity entity) {
+            return entity.$contractStateClassName_state;
+        }
+
+        @Override
+        public void set(VaultStatesEntity entity, PropertyState value) {
+            entity.$contractStateClassName_state = value;
+        }
+    })
+    .setGenerated(false)
+    .setLazy(false)
+    .setNullable(true)
+    .setUnique(false)
+    .build());
+
+    public static final AttributeDelegate<VaultStatesEntity, byte[]> CONTRACT_STATE = new AttributeDelegate(
+    new AttributeBuilder<VaultStatesEntity, byte[]>("contract_state", byte[].class)
+    .setProperty(new Property<VaultStatesEntity, byte[]>() {
+        @Override
+        public byte[] get(VaultStatesEntity entity) {
+            return entity.contractState;
+        }
+
+        @Override
+        public void set(VaultStatesEntity entity, byte[] value) {
+            entity.contractState = value;
+        }
+    })
+    .setPropertyName("getContractState")
+    .setPropertyState(new Property<VaultStatesEntity, PropertyState>() {
+        @Override
+        public PropertyState get(VaultStatesEntity entity) {
+            return entity.$contractState_state;
+        }
+
+        @Override
+        public void set(VaultStatesEntity entity, PropertyState value) {
+            entity.$contractState_state = value;
+        }
+    })
+    .setGenerated(false)
+    .setLazy(false)
+    .setNullable(true)
+    .setUnique(false)
+    .setLength(100000)
+    .build());
+
+    public static final AttributeDelegate<VaultStatesEntity, Vault.StateStatus> STATE_STATUS = new AttributeDelegate(
+    new AttributeBuilder<VaultStatesEntity, Vault.StateStatus>("state_status", Vault.StateStatus.class)
+    .setProperty(new Property<VaultStatesEntity, Vault.StateStatus>() {
+        @Override
+        public Vault.StateStatus get(VaultStatesEntity entity) {
+            return entity.stateStatus;
+        }
+
+        @Override
+        public void set(VaultStatesEntity entity, Vault.StateStatus value) {
+            entity.stateStatus = value;
+        }
+    })
+    .setPropertyName("getStateStatus")
+    .setPropertyState(new Property<VaultStatesEntity, PropertyState>() {
+        @Override
+        public PropertyState get(VaultStatesEntity entity) {
+            return entity.$stateStatus_state;
+        }
+
+        @Override
+        public void set(VaultStatesEntity entity, PropertyState value) {
+            entity.$stateStatus_state = value;
+        }
+    })
+    .setGenerated(false)
+    .setLazy(false)
+    .setNullable(true)
+    .setUnique(false)
+    .build());
+
+    public static final AttributeDelegate<VaultStatesEntity, Instant> RECORDED_TIME = new AttributeDelegate(
+    new AttributeBuilder<VaultStatesEntity, Instant>("recorded_timestamp", Instant.class)
+    .setProperty(new Property<VaultStatesEntity, Instant>() {
+        @Override
+        public Instant get(VaultStatesEntity entity) {
+            return entity.recordedTime;
+        }
+
+        @Override
+        public void set(VaultStatesEntity entity, Instant value) {
+            entity.recordedTime = value;
+        }
+    })
+    .setPropertyName("getRecordedTime")
+    .setPropertyState(new Property<VaultStatesEntity, PropertyState>() {
+        @Override
+        public PropertyState get(VaultStatesEntity entity) {
+            return entity.$recordedTime_state;
+        }
+
+        @Override
+        public void set(VaultStatesEntity entity, PropertyState value) {
+            entity.$recordedTime_state = value;
+        }
+    })
+    .setGenerated(false)
+    .setLazy(false)
+    .setNullable(true)
+    .setUnique(false)
+    .build());
+
+    public static final AttributeDelegate<VaultStatesEntity, Instant> CONSUMED_TIME = new AttributeDelegate(
+    new AttributeBuilder<VaultStatesEntity, Instant>("consumed_timestamp", Instant.class)
+    .setProperty(new Property<VaultStatesEntity, Instant>() {
+        @Override
+        public Instant get(VaultStatesEntity entity) {
+            return entity.consumedTime;
+        }
+
+        @Override
+        public void set(VaultStatesEntity entity, Instant value) {
+            entity.consumedTime = value;
+        }
+    })
+    .setPropertyName("getConsumedTime")
+    .setPropertyState(new Property<VaultStatesEntity, PropertyState>() {
+        @Override
+        public PropertyState get(VaultStatesEntity entity) {
+            return entity.$consumedTime_state;
+        }
+
+        @Override
+        public void set(VaultStatesEntity entity, PropertyState value) {
+            entity.$consumedTime_state = value;
+        }
+    })
+    .setGenerated(false)
+    .setLazy(false)
+    .setNullable(true)
+    .setUnique(false)
+    .build());
+
+    public static final AttributeDelegate<VaultStatesEntity, String> LOCK_ID = new AttributeDelegate(
+    new AttributeBuilder<VaultStatesEntity, String>("lock_id", String.class)
+    .setProperty(new Property<VaultStatesEntity, String>() {
+        @Override
+        public String get(VaultStatesEntity entity) {
+            return entity.lockId;
+        }
+
+        @Override
+        public void set(VaultStatesEntity entity, String value) {
+            entity.lockId = value;
+        }
+    })
+    .setPropertyName("getLockId")
+    .setPropertyState(new Property<VaultStatesEntity, PropertyState>() {
+        @Override
+        public PropertyState get(VaultStatesEntity entity) {
+            return entity.$lockId_state;
+        }
+
+        @Override
+        public void set(VaultStatesEntity entity, PropertyState value) {
+            entity.$lockId_state = value;
+        }
+    })
+    .setGenerated(false)
+    .setLazy(false)
+    .setNullable(true)
+    .setUnique(false)
+    .build());
+
+    public static final AttributeDelegate<VaultStatesEntity, Instant> LOCK_UPDATE_TIME = new AttributeDelegate(
+    new AttributeBuilder<VaultStatesEntity, Instant>("lock_timestamp", Instant.class)
+    .setProperty(new Property<VaultStatesEntity, Instant>() {
+        @Override
+        public Instant get(VaultStatesEntity entity) {
+            return entity.lockUpdateTime;
+        }
+
+        @Override
+        public void set(VaultStatesEntity entity, Instant value) {
+            entity.lockUpdateTime = value;
+        }
+    })
+    .setPropertyName("getLockUpdateTime")
+    .setPropertyState(new Property<VaultStatesEntity, PropertyState>() {
+        @Override
+        public PropertyState get(VaultStatesEntity entity) {
+            return entity.$lockUpdateTime_state;
+        }
+
+        @Override
+        public void set(VaultStatesEntity entity, PropertyState value) {
+            entity.$lockUpdateTime_state = value;
+        }
+    })
+    .setGenerated(false)
+    .setLazy(false)
+    .setNullable(true)
+    .setUnique(false)
+    .build());
+
+    public static final AttributeDelegate<VaultStatesEntity, String> TX_ID = new AttributeDelegate(
+    new AttributeBuilder<VaultStatesEntity, String>("transaction_id", String.class)
+    .setProperty(new Property<VaultStatesEntity, String>() {
+        @Override
+        public String get(VaultStatesEntity entity) {
+            return entity.txId;
+        }
+
+        @Override
+        public void set(VaultStatesEntity entity, String value) {
+            entity.txId = value;
+        }
+    })
+    .setPropertyName("getTxId")
+    .setPropertyState(new Property<VaultStatesEntity, PropertyState>() {
+        @Override
+        public PropertyState get(VaultStatesEntity entity) {
+            return entity.$txId_state;
+        }
+
+        @Override
+        public void set(VaultStatesEntity entity, PropertyState value) {
+            entity.$txId_state = value;
+        }
+    })
+    .setKey(true)
+    .setGenerated(false)
+    .setLazy(false)
+    .setNullable(true)
+    .setUnique(false)
+    .setLength(64)
+    .build());
+
+    public static final AttributeDelegate<VaultStatesEntity, Integer> INDEX = new AttributeDelegate(
+    new AttributeBuilder<VaultStatesEntity, Integer>("output_index", int.class)
+    .setProperty(new IntProperty<VaultStatesEntity>() {
+        @Override
+        public Integer get(VaultStatesEntity entity) {
+            return entity.index;
+        }
+
+        @Override
+        public void set(VaultStatesEntity entity, Integer value) {
+            if(value != null) {
+                entity.index = value;
+            }
+        }
+
+        @Override
+        public int getInt(VaultStatesEntity entity) {
+            return entity.index;
+        }
+
+        @Override
+        public void setInt(VaultStatesEntity entity, int value) {
+            entity.index = value;
+        }
+    })
+    .setPropertyName("getIndex")
+    .setPropertyState(new Property<VaultStatesEntity, PropertyState>() {
+        @Override
+        public PropertyState get(VaultStatesEntity entity) {
+            return entity.$index_state;
+        }
+
+        @Override
+        public void set(VaultStatesEntity entity, PropertyState value) {
+            entity.$index_state = value;
+        }
+    })
+    .setKey(true)
+    .setGenerated(false)
+    .setLazy(false)
+    .setNullable(true)
+    .setUnique(false)
+    .setLength(255)
+    .build());
+
+    public static final Type<VaultStatesEntity> $TYPE = new TypeBuilder<VaultStatesEntity>(VaultStatesEntity.class, "vault_states")
+    .setBaseType(VaultSchema.VaultStates.class)
+    .setCacheable(true)
+    .setImmutable(false)
+    .setReadOnly(false)
+    .setStateless(false)
+    .setFactory(new Supplier<VaultStatesEntity>() {
+        @Override
+        public VaultStatesEntity get() {
+            return new VaultStatesEntity();
+        }
+    })
+    .setProxyProvider(new Function<VaultStatesEntity, EntityProxy<VaultStatesEntity>>() {
+        @Override
+        public EntityProxy<VaultStatesEntity> apply(VaultStatesEntity entity) {
+            return entity.$proxy;
+        }
+    })
+    .addAttribute(NOTARY_NAME)
+    .addAttribute(NOTARY_KEY)
+    .addAttribute(CONSUMED_TIME)
+    .addAttribute(LOCK_ID)
+    .addAttribute(LOCK_UPDATE_TIME)
+    .addAttribute(CONTRACT_STATE_CLASS_NAME)
+    .addAttribute(INDEX)
+    .addAttribute(CONTRACT_STATE)
+    .addAttribute(STATE_STATUS)
+    .addAttribute(RECORDED_TIME)
+    .addAttribute(TX_ID)
+    .build();
+
+    private PropertyState $notaryName_state;
+
+    private PropertyState $notaryKey_state;
+
+    private PropertyState $contractStateClassName_state;
+
+    private PropertyState $contractState_state;
+
+    private PropertyState $stateStatus_state;
+
+    private PropertyState $recordedTime_state;
+
+    private PropertyState $consumedTime_state;
+
+    private PropertyState $lockId_state;
+
+    private PropertyState $lockUpdateTime_state;
+
+    private PropertyState $txId_state;
+
+    private PropertyState $index_state;
+
+    private String notaryName;
+
+    private String notaryKey;
+
+    private String contractStateClassName;
+
+    private byte[] contractState;
+
+    private Vault.StateStatus stateStatus;
+
+    private Instant recordedTime;
+
+    private Instant consumedTime;
+
+    private String lockId;
+
+    private Instant lockUpdateTime;
+
+    private String txId;
+
+    private int index;
+
+    private final transient EntityProxy<VaultStatesEntity> $proxy = new EntityProxy<VaultStatesEntity>(this, $TYPE);
+
+    public VaultStatesEntity() {
+    }
+
+    @Override
+    public String getNotaryName() {
+        return $proxy.get(NOTARY_NAME);
+    }
+
+    public void setNotaryName(String notaryName) {
+        $proxy.set(NOTARY_NAME, notaryName);
+    }
+
+    @Override
+    public String getNotaryKey() {
+        return $proxy.get(NOTARY_KEY);
+    }
+
+    public void setNotaryKey(String notaryKey) {
+        $proxy.set(NOTARY_KEY, notaryKey);
+    }
+
+    @Override
+    public String getContractStateClassName() {
+        return $proxy.get(CONTRACT_STATE_CLASS_NAME);
+    }
+
+    public void setContractStateClassName(String contractStateClassName) {
+        $proxy.set(CONTRACT_STATE_CLASS_NAME, contractStateClassName);
+    }
+
+    @Override
+    public byte[] getContractState() {
+        return $proxy.get(CONTRACT_STATE);
+    }
+
+    public void setContractState(byte[] contractState) {
+        $proxy.set(CONTRACT_STATE, contractState);
+    }
+
+    @Override
+    public Vault.StateStatus getStateStatus() {
+        return $proxy.get(STATE_STATUS);
+    }
+
+    public void setStateStatus(Vault.StateStatus stateStatus) {
+        $proxy.set(STATE_STATUS, stateStatus);
+    }
+
+    @Override
+    public Instant getRecordedTime() {
+        return $proxy.get(RECORDED_TIME);
+    }
+
+    public void setRecordedTime(Instant recordedTime) {
+        $proxy.set(RECORDED_TIME, recordedTime);
+    }
+
+    @Override
+    public Instant getConsumedTime() {
+        return $proxy.get(CONSUMED_TIME);
+    }
+
+    public void setConsumedTime(Instant consumedTime) {
+        $proxy.set(CONSUMED_TIME, consumedTime);
+    }
+
+    @Override
+    public String getLockId() {
+        return $proxy.get(LOCK_ID);
+    }
+
+    public void setLockId(String lockId) {
+        $proxy.set(LOCK_ID, lockId);
+    }
+
+    @Override
+    public Instant getLockUpdateTime() {
+        return $proxy.get(LOCK_UPDATE_TIME);
+    }
+
+    public void setLockUpdateTime(Instant lockUpdateTime) {
+        $proxy.set(LOCK_UPDATE_TIME, lockUpdateTime);
+    }
+
+    public String getTxId() {
+        return $proxy.get(TX_ID);
+    }
+
+    public void setTxId(String txId) {
+        $proxy.set(TX_ID, txId);
+    }
+
+    public int getIndex() {
+        return $proxy.get(INDEX);
+    }
+
+    public void setIndex(int index) {
+        $proxy.set(INDEX, index);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof VaultStatesEntity && ((VaultStatesEntity)obj).$proxy.equals(this.$proxy);
+    }
+
+    @Override
+    public int hashCode() {
+        return $proxy.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return $proxy.toString();
+    }
+}
diff --git a/node-schemas/build/generated/source/kapt/main/net/corda/node/services/vault/schemas/VaultTxnNoteEntity.java b/node-schemas/build/generated/source/kapt/main/net/corda/node/services/vault/schemas/VaultTxnNoteEntity.java
new file mode 100644
index 0000000000..f0a6c3e871
--- /dev/null
+++ b/node-schemas/build/generated/source/kapt/main/net/corda/node/services/vault/schemas/VaultTxnNoteEntity.java
@@ -0,0 +1,211 @@
+// Generated file do not edit, generated by io.requery.processor.EntityProcessor
+package net.corda.node.services.vault.schemas;
+
+import io.requery.Persistable;
+import io.requery.meta.AttributeBuilder;
+import io.requery.meta.AttributeDelegate;
+import io.requery.meta.Type;
+import io.requery.meta.TypeBuilder;
+import io.requery.proxy.EntityProxy;
+import io.requery.proxy.IntProperty;
+import io.requery.proxy.Property;
+import io.requery.proxy.PropertyState;
+import io.requery.util.function.Function;
+import io.requery.util.function.Supplier;
+import java.lang.Integer;
+import java.lang.Object;
+import java.lang.Override;
+import java.lang.String;
+import javax.annotation.Generated;
+
+@Generated("io.requery.processor.EntityProcessor")
+public class VaultTxnNoteEntity implements VaultSchema.VaultTxnNote, Persistable {
+    public static final AttributeDelegate<VaultTxnNoteEntity, Integer> SEQ_NO = new AttributeDelegate(
+    new AttributeBuilder<VaultTxnNoteEntity, Integer>("seq_no", int.class)
+    .setProperty(new IntProperty<VaultTxnNoteEntity>() {
+        @Override
+        public Integer get(VaultTxnNoteEntity entity) {
+            return entity.seqNo;
+        }
+
+        @Override
+        public void set(VaultTxnNoteEntity entity, Integer value) {
+            if(value != null) {
+                entity.seqNo = value;
+            }
+        }
+
+        @Override
+        public int getInt(VaultTxnNoteEntity entity) {
+            return entity.seqNo;
+        }
+
+        @Override
+        public void setInt(VaultTxnNoteEntity entity, int value) {
+            entity.seqNo = value;
+        }
+    })
+    .setPropertyName("getSeqNo")
+    .setPropertyState(new Property<VaultTxnNoteEntity, PropertyState>() {
+        @Override
+        public PropertyState get(VaultTxnNoteEntity entity) {
+            return entity.$seqNo_state;
+        }
+
+        @Override
+        public void set(VaultTxnNoteEntity entity, PropertyState value) {
+            entity.$seqNo_state = value;
+        }
+    })
+    .setKey(true)
+    .setGenerated(true)
+    .setLazy(false)
+    .setNullable(true)
+    .setUnique(false)
+    .build());
+
+    public static final AttributeDelegate<VaultTxnNoteEntity, String> TX_ID = new AttributeDelegate(
+    new AttributeBuilder<VaultTxnNoteEntity, String>("transaction_id", String.class)
+    .setProperty(new Property<VaultTxnNoteEntity, String>() {
+        @Override
+        public String get(VaultTxnNoteEntity entity) {
+            return entity.txId;
+        }
+
+        @Override
+        public void set(VaultTxnNoteEntity entity, String value) {
+            entity.txId = value;
+        }
+    })
+    .setPropertyName("getTxId")
+    .setPropertyState(new Property<VaultTxnNoteEntity, PropertyState>() {
+        @Override
+        public PropertyState get(VaultTxnNoteEntity entity) {
+            return entity.$txId_state;
+        }
+
+        @Override
+        public void set(VaultTxnNoteEntity entity, PropertyState value) {
+            entity.$txId_state = value;
+        }
+    })
+    .setGenerated(false)
+    .setLazy(false)
+    .setNullable(true)
+    .setUnique(false)
+    .setLength(64)
+    .build());
+
+    public static final AttributeDelegate<VaultTxnNoteEntity, String> NOTE = new AttributeDelegate(
+    new AttributeBuilder<VaultTxnNoteEntity, String>("note", String.class)
+    .setProperty(new Property<VaultTxnNoteEntity, String>() {
+        @Override
+        public String get(VaultTxnNoteEntity entity) {
+            return entity.note;
+        }
+
+        @Override
+        public void set(VaultTxnNoteEntity entity, String value) {
+            entity.note = value;
+        }
+    })
+    .setPropertyName("getNote")
+    .setPropertyState(new Property<VaultTxnNoteEntity, PropertyState>() {
+        @Override
+        public PropertyState get(VaultTxnNoteEntity entity) {
+            return entity.$note_state;
+        }
+
+        @Override
+        public void set(VaultTxnNoteEntity entity, PropertyState value) {
+            entity.$note_state = value;
+        }
+    })
+    .setGenerated(false)
+    .setLazy(false)
+    .setNullable(true)
+    .setUnique(false)
+    .build());
+
+    public static final Type<VaultTxnNoteEntity> $TYPE = new TypeBuilder<VaultTxnNoteEntity>(VaultTxnNoteEntity.class, "vault_transaction_notes")
+    .setBaseType(VaultSchema.VaultTxnNote.class)
+    .setCacheable(true)
+    .setImmutable(false)
+    .setReadOnly(false)
+    .setStateless(false)
+    .setFactory(new Supplier<VaultTxnNoteEntity>() {
+        @Override
+        public VaultTxnNoteEntity get() {
+            return new VaultTxnNoteEntity();
+        }
+    })
+    .setProxyProvider(new Function<VaultTxnNoteEntity, EntityProxy<VaultTxnNoteEntity>>() {
+        @Override
+        public EntityProxy<VaultTxnNoteEntity> apply(VaultTxnNoteEntity entity) {
+            return entity.$proxy;
+        }
+    })
+    .addAttribute(SEQ_NO)
+    .addAttribute(NOTE)
+    .addAttribute(TX_ID)
+    .build();
+
+    private PropertyState $seqNo_state;
+
+    private PropertyState $txId_state;
+
+    private PropertyState $note_state;
+
+    private int seqNo;
+
+    private String txId;
+
+    private String note;
+
+    private final transient EntityProxy<VaultTxnNoteEntity> $proxy = new EntityProxy<VaultTxnNoteEntity>(this, $TYPE);
+
+    public VaultTxnNoteEntity() {
+    }
+
+    @Override
+    public int getSeqNo() {
+        return $proxy.get(SEQ_NO);
+    }
+
+    public void setSeqNo(int seqNo) {
+        $proxy.set(SEQ_NO, seqNo);
+    }
+
+    @Override
+    public String getTxId() {
+        return $proxy.get(TX_ID);
+    }
+
+    public void setTxId(String txId) {
+        $proxy.set(TX_ID, txId);
+    }
+
+    @Override
+    public String getNote() {
+        return $proxy.get(NOTE);
+    }
+
+    public void setNote(String note) {
+        $proxy.set(NOTE, note);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof VaultTxnNoteEntity && ((VaultTxnNoteEntity)obj).$proxy.equals(this.$proxy);
+    }
+
+    @Override
+    public int hashCode() {
+        return $proxy.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return $proxy.toString();
+    }
+}