diff --git a/lib/evm/eei.js b/lib/evm/eei.js
index 76b34eb4ec..cf57dcff9a 100644
--- a/lib/evm/eei.js
+++ b/lib/evm/eei.js
@@ -2,7 +2,7 @@ const promisify = require('util.promisify')
 const BN = require('bn.js')
 const { VmError, ERROR } = require('../exceptions')
 const PStateManager = require('../state/promisified').default
-const Message = require('./message')
+const Message = require('./message').default
 
 module.exports = class EEI {
   constructor (env) {
diff --git a/lib/evm/message.ts b/lib/evm/message.ts
index 2be39e82ea..1d96de7870 100644
--- a/lib/evm/message.ts
+++ b/lib/evm/message.ts
@@ -1,7 +1,21 @@
-const BN = require('bn.js')
+import BN = require('bn.js')
 
-module.exports = class Message {
-  constructor (opts) {
+export default class Message {
+  to: Buffer
+  value: BN
+  caller: Buffer
+  gasLimit: BN
+  data: Buffer
+  depth: number
+  code: Buffer
+  _codeAddress: Buffer
+  isStatic: boolean
+  isCompiled: boolean
+  salt: Buffer
+  selfdestruct: any
+  delegatecall: boolean
+
+  constructor (opts: any) {
     this.to = opts.to
     this.value = opts.value ? new BN(opts.value) : new BN(0)
     this.caller = opts.caller
@@ -17,7 +31,7 @@ module.exports = class Message {
     this.delegatecall = opts.delegatecall || false
   }
 
-  get codeAddress () {
+  get codeAddress (): Buffer {
     return this._codeAddress ? this._codeAddress : this.to
   }
 }
diff --git a/lib/runCall.js b/lib/runCall.js
index e2c56cae47..4e27de69cf 100644
--- a/lib/runCall.js
+++ b/lib/runCall.js
@@ -3,7 +3,7 @@ const Block = require('ethereumjs-block')
 const BN = ethUtil.BN
 const { StorageReader } = require('./state')
 const TxContext = require('./evm/txContext').default
-const Message = require('./evm/message')
+const Message = require('./evm/message').default
 const Interpreter = require('./evm/interpreter')
 
 /**
diff --git a/lib/runTx.js b/lib/runTx.js
index f6105fb7c8..0b34ff143b 100644
--- a/lib/runTx.js
+++ b/lib/runTx.js
@@ -4,7 +4,7 @@ const Bloom = require('./bloom').default
 const Block = require('ethereumjs-block')
 const Account = require('ethereumjs-account').default
 const Interpreter = require('./evm/interpreter')
-const Message = require('./evm/message')
+const Message = require('./evm/message').default
 const TxContext = require('./evm/txContext').default
 const { StorageReader } = require('./state')
 const PStateManager = require('./state/promisified').default