diff --git a/bip-0040.mediawiki b/bip-0040.mediawiki
index cb6cf706..78166cd6 100644
--- a/bip-0040.mediawiki
+++ b/bip-0040.mediawiki
@@ -137,14 +137,18 @@ On top of Stratum, some services are defined. They are listed below, grouped by
 * [[bip-0040/service-discovery.mediawiki|Discovery]]
 * [[bip-0040/service-example.mediawiki|Example]]
 * [[bip-0040/service-example.pubsub.mediawiki|Example Publish-Subscribe]]
+* [[bip-0040/service-server.mediawiki|Server]]
+* [[bip-0040/service-server.peers.mediawiki|Server Peers]]
 
 ===Vendor: Electrum===
 
+* [[bip-0040/service-blockchain.mediawiki|Blockchain]]
 * [[bip-0040/service-blockchain.address.mediawiki|Blockchain Address]]
 * [[bip-0040/service-blockchain.block.mediawiki|Blockchain Block]]
+* [[bip-0040/service-blockchain.headers.mediawiki|Blockchain Headers]]
+* [[bip-0040/service-blockchain.numblocks.mediawiki|Blockchain Number of Blocks]]
 * [[bip-0040/service-blockchain.transaction.mediawiki|Blockchain Transaction]]
-* [[bip-0040/service-node.mediawiki|Node]]
-* [[bip-0040/service-wallet.mediawiki|Wallet]]
+* [[bip-0040/service-blockchain.utxo.mediawiki|Blockchain Unspent Transaction Output]]
 
 ===Vendor: blockchain.info===
 
diff --git a/bip-0040/service-blockchain.headers.mediawiki b/bip-0040/service-blockchain.headers.mediawiki
new file mode 100644
index 00000000..891836e3
--- /dev/null
+++ b/bip-0040/service-blockchain.headers.mediawiki
@@ -0,0 +1,8 @@
+=Service: Blockchain Headers=
+
+* Service type: <code>blockchain.headers</code>
+* Service vendor: <code>Electrum</code>
+
+==Method: Subscribe==
+
+* Method name: <code>subscribe</code>
\ No newline at end of file
diff --git a/bip-0040/service-blockchain.mediawiki b/bip-0040/service-blockchain.mediawiki
new file mode 100644
index 00000000..48073977
--- /dev/null
+++ b/bip-0040/service-blockchain.mediawiki
@@ -0,0 +1,12 @@
+=Service: Blockchain=
+
+* Service type: <code>blockchain</code>
+* Service vendor: <code>Electrum</code>
+
+==Method: Estimate Fee==
+
+* Method name: <code>estimatefee</code>
+
+==Method: Relay Fee==
+
+* Method name: <code>relayfee</code>
\ No newline at end of file
diff --git a/bip-0040/service-blockchain.numblocks.mediawiki b/bip-0040/service-blockchain.numblocks.mediawiki
new file mode 100644
index 00000000..8a4f8604
--- /dev/null
+++ b/bip-0040/service-blockchain.numblocks.mediawiki
@@ -0,0 +1,8 @@
+=Service: Blockchain Number of Blocks=
+
+* Service type: <code>blockchain.numblocks</code>
+* Service vendor: <code>Electrum</code>
+
+==Method: Subscribe==
+
+* Method name: <code>subscribe</code>
\ No newline at end of file
diff --git a/bip-0040/service-blockchain.utxo.mediawiki b/bip-0040/service-blockchain.utxo.mediawiki
new file mode 100644
index 00000000..bcc3166f
--- /dev/null
+++ b/bip-0040/service-blockchain.utxo.mediawiki
@@ -0,0 +1,8 @@
+=Service: Blockchain Unspent Transaction Output=
+
+* Service type: <code>blockchain.utxo</code>
+* Service vendor: <code>Electrum</code>
+
+==Method: Get Address==
+
+* Method name: <code>get_address</code>
\ No newline at end of file
diff --git a/bip-0040/service-wallet.mediawiki b/bip-0040/service-wallet.mediawiki
deleted file mode 100644
index 8a637d6e..00000000
--- a/bip-0040/service-wallet.mediawiki
+++ /dev/null
@@ -1,175 +0,0 @@
-=Service: Wallet=
-
-<span style="color:red;">This service has never been properly defined. It is therefore not standardized and may be removed.</span>
-
-* Service type: <code>wallet</code>
-* Service vendor: <code>Electrum</code>
-
-==Method: Import Seed==
-
-* Method name: <code>import_seed</code>
-
-{|
-! <ins>[Request]</ins>
-! Type
-! Example
-! Description
-|-
-! Method
-| colspan="3" | <code>wallet.import_seed</code>
-|-
-! Params [0] (<code>seed</code>)
-| <code>string</code>
-| <code>update stomach couch actress cart dose coral slice frozen settle alarm boost</code>
-| The seed.
-|-
-! <ins>[Response]</ins>
-! Type
-! Example
-! Description
-|-
-! Result
-| <code>boolean</code>
-| <code>true</code>
-| Unknown
-|}
-
-==Method: Add Public Key==
-
-* Method name: <code>add_pubkey</code>
-
-{|
-! <ins>[Request]</ins>
-! Type
-! Example
-! Description
-|-
-! Method
-| colspan="3" | <code>wallet.add_pubkey</code>
-|-
-! Params [0] (<code>pubkey</code>)
-| <code>string</code>
-| Unknown
-| The public key.
-|-
-! <ins>[Response]</ins>
-! Type
-! Example
-! Description
-|-
-! Result
-| <code>boolean</code>
-| <code>true</code>
-| Unknown
-|}
-
-==Method: Remove Public Key==
-
-* Method name: <code>remove_pubkey</code>
-
-{|
-! <ins>[Request]</ins>
-! Type
-! Example
-! Description
-|-
-! Method
-| colspan="3" | <code>wallet.remove_pubkey</code>
-|-
-! Params [0] (<code>pubkey</code>)
-| <code>string</code>
-| Unknown
-| The public key.
-|-
-! <ins>[Response]</ins>
-! Type
-! Example
-! Description
-|-
-! Result
-| <code>boolean</code>
-| <code>true</code>
-| Unknown
-|}
-
-==Method: Create transaction==
-
-* Method name: <code>create_transaction</code>
-
-{|
-! <ins>[Request]</ins>
-! Type
-! Example
-! Description
-|-
-! Method
-| colspan="3" | <code>wallet.create_transaction</code>
-|-
-! Params [0] (<code>address</code>)
-| <code>string</code>
-| <code>1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L</code>
-| The address.
-|-
-! Params [1] (<code>amount</code>)
-| Unknown
-| Unknown
-| The amount.
-|-
-! <ins>[Response]</ins>
-! Type
-! Example
-! Description
-|-
-! Result
-| <code>string</code>
-| <code></code>
-| Unknown
-|}
-
-==Method: Save==
-
-* Method name: <code>save</code>
-
-{|
-! <ins>[Request]</ins>
-! Type
-! Example
-! Description
-|-
-! Method
-| colspan="3" | <code>wallet.save</code>
-|-
-! <ins>[Response]</ins>
-! Type
-! Example
-! Description
-|-
-! Result
-| <code>boolean</code>
-| <code>true</code>
-| Unknown
-|}
-
-==Method: Load==
-
-* Method name: <code>load</code>
-
-{|
-! <ins>[Request]</ins>
-! Type
-! Example
-! Description
-|-
-! Method
-| colspan="3" | <code>wallet.load</code>
-|-
-! <ins>[Response]</ins>
-! Type
-! Example
-! Description
-|-
-! Result
-| <code>boolean</code>
-| <code>true</code>
-| Unknown
-|}
\ No newline at end of file