diff --git a/v2/python/wallet_pb2.py b/v2/python/wallet_pb2.py
index c3a90da..b95decc 100644
--- a/v2/python/wallet_pb2.py
+++ b/v2/python/wallet_pb2.py
@@ -20,7 +20,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
   name='wallet.proto',
   package='pb',
   syntax='proto3',
-  serialized_pb=_b('\n\x0cwallet.proto\x12\x02pb\x1a\x1cgoogle/protobuf/struct.proto\"w\n\x06Wallet\x12\x1d\n\x08\x61\x63\x63ounts\x18\x01 \x03(\x0b\x32\x0b.pb.Account\x12\x0c\n\x04name\x18\x02 \x01(\t\x12/\n\x0bpreferences\x18\x03 \x01(\x0b\x32\x1a.pb.TimestampedPreferences\x12\x0f\n\x07version\x18\x04 \x01(\r\"\xdd\x04\n\x07\x41\x63\x63ount\x12J\n\x11\x61\x64\x64ress_generator\x18\x01 \x01(\x0b\x32\x1c.pb.Account.AddressGeneratorR\x11\x61\x64\x64ress_generator\x12\x33\n\x0c\x63\x65rtificates\x18\x02 \x03(\x0b\x32\x1d.pb.Account.CertificatesEntry\x12\x11\n\tencrypted\x18\x03 \x01(\x08\x12\x0e\n\x06ledger\x18\x04 \x01(\t\x12 \n\x0bmodified_on\x18\x05 \x01(\rR\x0bmodified_on\x12\x0c\n\x04name\x18\x06 \x01(\t\x12 \n\x0bprivate_key\x18\x07 \x01(\tR\x0bprivate_key\x12\x1e\n\npublic_key\x18\x08 \x01(\tR\npublic_key\x12\x0c\n\x04seed\x18\t \x01(\t\x1a\xf8\x01\n\x10\x41\x64\x64ressGenerator\x12\x0c\n\x04name\x18\x01 \x01(\t\x12;\n\x06\x63hange\x18\x02 \x01(\x0b\x32+.pb.Account.AddressGenerator.AddressManager\x12>\n\treceiving\x18\x03 \x01(\x0b\x32+.pb.Account.AddressGenerator.AddressManager\x1aY\n\x0e\x41\x64\x64ressManager\x12\x0b\n\x03gap\x18\x01 \x01(\r\x12:\n\x18maximum_uses_per_address\x18\x02 \x01(\rR\x18maximum_uses_per_address\x1a\x33\n\x11\x43\x65rtificatesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xb0\x04\n\x16TimestampedPreferences\x12G\n\x0b\x65nable_sync\x18\x01 \x01(\x0b\x32%.pb.TimestampedPreferences.EnableSyncR\x0b\x65nable-sync\x12R\n\x0f\x65ncrypt_on_disk\x18\x02 \x01(\x0b\x32(.pb.TimestampedPreferences.EncryptOnDiskR\x0f\x65ncrypt-on-disk\x12\x35\n\x05local\x18\x03 \x01(\x0b\x32&.pb.TimestampedPreferences.Preferences\x12\x36\n\x06shared\x18\x04 \x01(\x0b\x32&.pb.TimestampedPreferences.Preferences\x1a*\n\rEncryptOnDisk\x12\n\n\x02ts\x18\x01 \x01(\r\x12\r\n\x05value\x18\x02 \x01(\x08\x1a\'\n\nEnableSync\x12\n\n\x02ts\x18\x01 \x01(\r\x12\r\n\x05value\x18\x02 \x01(\x08\x1a\xb4\x01\n\x0bPreferences\x12\n\n\x02ts\x18\x01 \x01(\r\x12\x42\n\x05value\x18\x02 \x01(\x0b\x32\x33.pb.TimestampedPreferences.Preferences.Preferences_\x1aU\n\x0cPreferences_\x12\x0c\n\x04type\x18\x01 \x01(\t\x12&\n\x05value\x18\x02 \x01(\x0b\x32\x17.google.protobuf.Struct\x12\x0f\n\x07version\x18\x03 \x01(\tb\x06proto3')
+  serialized_pb=_b('\n\x0cwallet.proto\x12\x02pb\x1a\x1cgoogle/protobuf/struct.proto\"w\n\x06Wallet\x12\x1d\n\x08\x61\x63\x63ounts\x18\x01 \x03(\x0b\x32\x0b.pb.Account\x12\x0c\n\x04name\x18\x02 \x01(\t\x12/\n\x0bpreferences\x18\x03 \x01(\x0b\x32\x1a.pb.TimestampedPreferences\x12\x0f\n\x07version\x18\x04 \x01(\r\"\xba\x04\n\x07\x41\x63\x63ount\x12J\n\x11\x61\x64\x64ress_generator\x18\x01 \x01(\x0b\x32\x1c.pb.Account.AddressGeneratorR\x11\x61\x64\x64ress_generator\x12\x33\n\x0c\x63\x65rtificates\x18\x02 \x03(\x0b\x32\x1d.pb.Account.CertificatesEntry\x12\x11\n\tencrypted\x18\x03 \x01(\x08\x12\x0e\n\x06ledger\x18\x04 \x01(\t\x12 \n\x0bmodified_on\x18\x05 \x01(\rR\x0bmodified_on\x12\x0c\n\x04name\x18\x06 \x01(\t\x12 \n\x0bprivate_key\x18\x07 \x01(\tR\x0bprivate_key\x12\x1e\n\npublic_key\x18\x08 \x01(\tR\npublic_key\x12\x0c\n\x04seed\x18\t \x01(\t\x1aY\n\x0e\x41\x64\x64ressManager\x12\x0b\n\x03gap\x18\x01 \x01(\r\x12:\n\x18maximum_uses_per_address\x18\x02 \x01(\rR\x18maximum_uses_per_address\x1a{\n\x10\x41\x64\x64ressGenerator\x12\x0c\n\x04name\x18\x01 \x01(\t\x12*\n\x06\x63hange\x18\x02 \x01(\x0b\x32\x1a.pb.Account.AddressManager\x12-\n\treceiving\x18\x03 \x01(\x0b\x32\x1a.pb.Account.AddressManager\x1a\x33\n\x11\x43\x65rtificatesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xb0\x04\n\x16TimestampedPreferences\x12G\n\x0b\x65nable_sync\x18\x01 \x01(\x0b\x32%.pb.TimestampedPreferences.EnableSyncR\x0b\x65nable-sync\x12R\n\x0f\x65ncrypt_on_disk\x18\x02 \x01(\x0b\x32(.pb.TimestampedPreferences.EncryptOnDiskR\x0f\x65ncrypt-on-disk\x12\x35\n\x05local\x18\x03 \x01(\x0b\x32&.pb.TimestampedPreferences.Preferences\x12\x36\n\x06shared\x18\x04 \x01(\x0b\x32&.pb.TimestampedPreferences.Preferences\x1a*\n\rEncryptOnDisk\x12\n\n\x02ts\x18\x01 \x01(\r\x12\r\n\x05value\x18\x02 \x01(\x08\x1a\'\n\nEnableSync\x12\n\n\x02ts\x18\x01 \x01(\r\x12\r\n\x05value\x18\x02 \x01(\x08\x1a\xb4\x01\n\x0bPreferences\x12\n\n\x02ts\x18\x01 \x01(\r\x12\x42\n\x05value\x18\x02 \x01(\x0b\x32\x33.pb.TimestampedPreferences.Preferences.Preferences_\x1aU\n\x0cPreferences_\x12\x0c\n\x04type\x18\x01 \x01(\t\x12&\n\x05value\x18\x02 \x01(\x0b\x32\x17.google.protobuf.Struct\x12\x0f\n\x07version\x18\x03 \x01(\tb\x06proto3')
   ,
   dependencies=[google_dot_protobuf_dot_struct__pb2.DESCRIPTOR,])
 _sym_db.RegisterFileDescriptor(DESCRIPTOR)
@@ -80,22 +80,22 @@ _WALLET = _descriptor.Descriptor(
 )
 
 
-_ACCOUNT_ADDRESSGENERATOR_ADDRESSMANAGER = _descriptor.Descriptor(
+_ACCOUNT_ADDRESSMANAGER = _descriptor.Descriptor(
   name='AddressManager',
-  full_name='pb.Account.AddressGenerator.AddressManager',
+  full_name='pb.Account.AddressManager',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
     _descriptor.FieldDescriptor(
-      name='gap', full_name='pb.Account.AddressGenerator.AddressManager.gap', index=0,
+      name='gap', full_name='pb.Account.AddressManager.gap', index=0,
       number=1, type=13, cpp_type=3, label=1,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
-      name='maximum_uses_per_address', full_name='pb.Account.AddressGenerator.AddressManager.maximum_uses_per_address', index=1,
+      name='maximum_uses_per_address', full_name='pb.Account.AddressManager.maximum_uses_per_address', index=1,
       number=2, type=13, cpp_type=3, label=1,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
@@ -113,8 +113,8 @@ _ACCOUNT_ADDRESSGENERATOR_ADDRESSMANAGER = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=635,
-  serialized_end=724,
+  serialized_start=475,
+  serialized_end=564,
 )
 
 _ACCOUNT_ADDRESSGENERATOR = _descriptor.Descriptor(
@@ -148,7 +148,7 @@ _ACCOUNT_ADDRESSGENERATOR = _descriptor.Descriptor(
   ],
   extensions=[
   ],
-  nested_types=[_ACCOUNT_ADDRESSGENERATOR_ADDRESSMANAGER, ],
+  nested_types=[],
   enum_types=[
   ],
   options=None,
@@ -157,8 +157,8 @@ _ACCOUNT_ADDRESSGENERATOR = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=476,
-  serialized_end=724,
+  serialized_start=566,
+  serialized_end=689,
 )
 
 _ACCOUNT_CERTIFICATESENTRY = _descriptor.Descriptor(
@@ -194,8 +194,8 @@ _ACCOUNT_CERTIFICATESENTRY = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=726,
-  serialized_end=777,
+  serialized_start=691,
+  serialized_end=742,
 )
 
 _ACCOUNT = _descriptor.Descriptor(
@@ -271,7 +271,7 @@ _ACCOUNT = _descriptor.Descriptor(
   ],
   extensions=[
   ],
-  nested_types=[_ACCOUNT_ADDRESSGENERATOR, _ACCOUNT_CERTIFICATESENTRY, ],
+  nested_types=[_ACCOUNT_ADDRESSMANAGER, _ACCOUNT_ADDRESSGENERATOR, _ACCOUNT_CERTIFICATESENTRY, ],
   enum_types=[
   ],
   options=None,
@@ -281,7 +281,7 @@ _ACCOUNT = _descriptor.Descriptor(
   oneofs=[
   ],
   serialized_start=172,
-  serialized_end=777,
+  serialized_end=742,
 )
 
 
@@ -318,8 +318,8 @@ _TIMESTAMPEDPREFERENCES_ENCRYPTONDISK = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=1074,
-  serialized_end=1116,
+  serialized_start=1039,
+  serialized_end=1081,
 )
 
 _TIMESTAMPEDPREFERENCES_ENABLESYNC = _descriptor.Descriptor(
@@ -355,8 +355,8 @@ _TIMESTAMPEDPREFERENCES_ENABLESYNC = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=1118,
-  serialized_end=1157,
+  serialized_start=1083,
+  serialized_end=1122,
 )
 
 _TIMESTAMPEDPREFERENCES_PREFERENCES_PREFERENCES_ = _descriptor.Descriptor(
@@ -399,8 +399,8 @@ _TIMESTAMPEDPREFERENCES_PREFERENCES_PREFERENCES_ = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=1255,
-  serialized_end=1340,
+  serialized_start=1220,
+  serialized_end=1305,
 )
 
 _TIMESTAMPEDPREFERENCES_PREFERENCES = _descriptor.Descriptor(
@@ -436,8 +436,8 @@ _TIMESTAMPEDPREFERENCES_PREFERENCES = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=1160,
-  serialized_end=1340,
+  serialized_start=1125,
+  serialized_end=1305,
 )
 
 _TIMESTAMPEDPREFERENCES = _descriptor.Descriptor(
@@ -487,15 +487,15 @@ _TIMESTAMPEDPREFERENCES = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=780,
-  serialized_end=1340,
+  serialized_start=745,
+  serialized_end=1305,
 )
 
 _WALLET.fields_by_name['accounts'].message_type = _ACCOUNT
 _WALLET.fields_by_name['preferences'].message_type = _TIMESTAMPEDPREFERENCES
-_ACCOUNT_ADDRESSGENERATOR_ADDRESSMANAGER.containing_type = _ACCOUNT_ADDRESSGENERATOR
-_ACCOUNT_ADDRESSGENERATOR.fields_by_name['change'].message_type = _ACCOUNT_ADDRESSGENERATOR_ADDRESSMANAGER
-_ACCOUNT_ADDRESSGENERATOR.fields_by_name['receiving'].message_type = _ACCOUNT_ADDRESSGENERATOR_ADDRESSMANAGER
+_ACCOUNT_ADDRESSMANAGER.containing_type = _ACCOUNT
+_ACCOUNT_ADDRESSGENERATOR.fields_by_name['change'].message_type = _ACCOUNT_ADDRESSMANAGER
+_ACCOUNT_ADDRESSGENERATOR.fields_by_name['receiving'].message_type = _ACCOUNT_ADDRESSMANAGER
 _ACCOUNT_ADDRESSGENERATOR.containing_type = _ACCOUNT
 _ACCOUNT_CERTIFICATESENTRY.containing_type = _ACCOUNT
 _ACCOUNT.fields_by_name['address_generator'].message_type = _ACCOUNT_ADDRESSGENERATOR
@@ -523,14 +523,14 @@ _sym_db.RegisterMessage(Wallet)
 
 Account = _reflection.GeneratedProtocolMessageType('Account', (_message.Message,), dict(
 
-  AddressGenerator = _reflection.GeneratedProtocolMessageType('AddressGenerator', (_message.Message,), dict(
+  AddressManager = _reflection.GeneratedProtocolMessageType('AddressManager', (_message.Message,), dict(
+    DESCRIPTOR = _ACCOUNT_ADDRESSMANAGER,
+    __module__ = 'wallet_pb2'
+    # @@protoc_insertion_point(class_scope:pb.Account.AddressManager)
+    ))
+  ,
 
-    AddressManager = _reflection.GeneratedProtocolMessageType('AddressManager', (_message.Message,), dict(
-      DESCRIPTOR = _ACCOUNT_ADDRESSGENERATOR_ADDRESSMANAGER,
-      __module__ = 'wallet_pb2'
-      # @@protoc_insertion_point(class_scope:pb.Account.AddressGenerator.AddressManager)
-      ))
-    ,
+  AddressGenerator = _reflection.GeneratedProtocolMessageType('AddressGenerator', (_message.Message,), dict(
     DESCRIPTOR = _ACCOUNT_ADDRESSGENERATOR,
     __module__ = 'wallet_pb2'
     # @@protoc_insertion_point(class_scope:pb.Account.AddressGenerator)
@@ -548,8 +548,8 @@ Account = _reflection.GeneratedProtocolMessageType('Account', (_message.Message,
   # @@protoc_insertion_point(class_scope:pb.Account)
   ))
 _sym_db.RegisterMessage(Account)
+_sym_db.RegisterMessage(Account.AddressManager)
 _sym_db.RegisterMessage(Account.AddressGenerator)
-_sym_db.RegisterMessage(Account.AddressGenerator.AddressManager)
 _sym_db.RegisterMessage(Account.CertificatesEntry)
 
 TimestampedPreferences = _reflection.GeneratedProtocolMessageType('TimestampedPreferences', (_message.Message,), dict(