diff --git a/src/accountant_skel.rs b/src/accountant_skel.rs
index 5a95337ea7..228b840200 100644
--- a/src/accountant_skel.rs
+++ b/src/accountant_skel.rs
@@ -1,6 +1,6 @@
 use std::io;
 use accountant::Accountant;
-use event::{Event, PublicKey, Signature, Transfer};
+use event::{Event, PublicKey, Transfer};
 use log::{Entry, Sha256Hash};
 use std::net::UdpSocket;
 use bincode::{deserialize, serialize};
@@ -11,22 +11,10 @@ pub struct AccountantSkel {
 
 #[derive(Serialize, Deserialize, Debug)]
 pub enum Request {
-    Transaction {
-        from: PublicKey,
-        to: PublicKey,
-        val: i64,
-        last_id: Sha256Hash,
-        sig: Signature,
-    },
-    GetBalance {
-        key: PublicKey,
-    },
-    GetEntries {
-        last_id: Sha256Hash,
-    },
-    GetId {
-        is_last: bool,
-    },
+    Transaction(Transfer<i64>),
+    GetBalance { key: PublicKey },
+    GetEntries { last_id: Sha256Hash },
+    GetId { is_last: bool },
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -43,20 +31,8 @@ impl AccountantSkel {
 
     pub fn process_request(self: &mut Self, msg: Request) -> Option<Response> {
         match msg {
-            Request::Transaction {
-                from,
-                to,
-                val,
-                last_id,
-                sig,
-            } => {
-                let event = Event::Transaction(Transfer {
-                    from,
-                    to,
-                    data: val,
-                    last_id,
-                    sig,
-                });
+            Request::Transaction(transfer) => {
+                let event = Event::Transaction(transfer);
                 if let Err(err) = self.acc.process_event(event) {
                     eprintln!("Transfer error: {:?}", err);
                 }
diff --git a/src/accountant_stub.rs b/src/accountant_stub.rs
index 2336051bb8..d39858e010 100644
--- a/src/accountant_stub.rs
+++ b/src/accountant_stub.rs
@@ -5,7 +5,7 @@
 use std::net::UdpSocket;
 use std::io;
 use bincode::{deserialize, serialize};
-use event::{get_pubkey, get_signature, sign_transaction_data, PublicKey, Signature};
+use event::{get_pubkey, get_signature, sign_transaction_data, PublicKey, Signature, Transfer};
 use log::{Entry, Sha256Hash};
 use ring::signature::Ed25519KeyPair;
 use accountant_skel::{Request, Response};
@@ -33,13 +33,13 @@ impl AccountantStub {
         last_id: Sha256Hash,
         sig: Signature,
     ) -> io::Result<usize> {
-        let req = Request::Transaction {
+        let req = Request::Transaction(Transfer {
             from,
             to,
-            val,
+            data: val,
             last_id,
             sig,
-        };
+        });
         let data = serialize(&req).unwrap();
         self.socket.send_to(&data, &self.addr)
     }