diff --git a/lib/messages/builder.js b/lib/messages/builder.js
index 944714b..37c795c 100644
--- a/lib/messages/builder.js
+++ b/lib/messages/builder.js
@@ -46,9 +46,9 @@ function builder(options) {
     commands: commands
   };
 
-  commands.version = require('./commands/version')({magicNumber: magicNumber});
-  commands.verack = require('./commands/verack')({magicNumber: magicNumber});
-  commands.ping = require('./commands/ping')({magicNumber: magicNumber});
+  commands.version = require('./commands/version')(options);
+  commands.verack = require('./commands/verack')(options);
+  commands.ping = require('./commands/ping')(options);
 
   /* pong */
 
@@ -77,7 +77,7 @@ function builder(options) {
     return this.nonce;
   };
 
-  commands.block = require('./commands/block')({Block: Block, magicNumber: magicNumber});
+  commands.block = require('./commands/block')(options);
 
   /* tx */