diff --git a/app/components/add-proposal/component.js b/app/components/add-proposal/component.js
index aba9926..e7acf1a 100644
--- a/app/components/add-proposal/component.js
+++ b/app/components/add-proposal/component.js
@@ -8,7 +8,7 @@ export default Component.extend({
 
   // Default attributes used by reset
   attributes: {
-    recipientId: null,
+    contributorId: null,
     kind: 'community',
     amount: null,
     description: null,
@@ -22,7 +22,7 @@ export default Component.extend({
 
   contributors: [],
 
-  isValidRecipient: isPresent('recipientId'),
+  isValidRecipient: isPresent('contributorId'),
   isValidAmount: computed('amount', function() {
     return parseInt(this.get('amount'), 10) > 0;
   }),
diff --git a/app/components/add-proposal/template.hbs b/app/components/add-proposal/template.hbs
index c7bb975..4f3cb9f 100644
--- a/app/components/add-proposal/template.hbs
+++ b/app/components/add-proposal/template.hbs
@@ -1,9 +1,9 @@
 <form {{action "submit" on="submit"}}>
   <p>
-    <select required onchange={{action (mut recipientId) value="target.value"}}>
+    <select required onchange={{action (mut contributorId) value="target.value"}}>
       <option value="" selected disabled hidden>Contributor</option>
       {{#each contributors as |contributor|}}
-        <option value={{contributor.id}} selected={{eq recipientId contributor.id}}>{{contributor.github_username}}</option>
+        <option value={{contributor.id}} selected={{eq contributorId contributor.id}}>{{contributor.github_username}}</option>
       {{/each}}
     </select>
   </p>
diff --git a/app/controllers/index.js b/app/controllers/index.js
index 1f5ca43..4da9e49 100644
--- a/app/controllers/index.js
+++ b/app/controllers/index.js
@@ -26,7 +26,7 @@ export default Controller.extend({
     return this.get('model.proposals')
                .map((proposal) => {
                  let contributor = this.get('contributors')
-                                       .findBy('id', proposal.get('recipientId'));
+                                       .findBy('id', proposal.get('contributorId'));
 
                  proposal.set('contributor', contributor);
 
@@ -52,10 +52,9 @@ export default Controller.extend({
     this.get('proposals').pushObject(proposal);
   },
 
-  _handleProposalExecuted(proposalId, recipientId, amount) {
-    // TODO: check if proposalId is already a string
+  _handleProposalExecuted(proposalId, contributorId, amount) {
     let proposal = this.get('proposals')
-                       .findBy('id', proposalId.toString());
+                       .findBy('id', proposalId);
 
     if (proposal.get('isExecuted')) {
       Ember.Logger.debug('[index] proposal already executed, not adding from event');
@@ -67,13 +66,13 @@ export default Controller.extend({
     });
 
     this.get('contributors')
-        .findBy('id', recipientId.toString())
+        .findBy('id', contributorId)
         .incrementProperty('balance', amount);
   },
 
   _handleProposalVoted(proposalId, voter, totalVotes) {
     this.get('proposals')
-        .findBy('id', proposalId.toString())
+        .findBy('id', proposalId)
         .setProperties({ 'votesCount': totalVotes });
   },
 
diff --git a/app/controllers/proposals/new.js b/app/controllers/proposals/new.js
index dbea973..2b2f869 100644
--- a/app/controllers/proposals/new.js
+++ b/app/controllers/proposals/new.js
@@ -11,7 +11,7 @@ export default Controller.extend({
   actions: {
     save(proposal) {
       // contributorIpfsHash is needed for the proposal ipfs data. I'm not happy to do this here but I think to load all the contributors in addProposal again is a bit too much. I hope we can refactor it later.
-      let contributor = this.get('contributors').findBy('id', proposal.recipientId);
+      let contributor = this.get('contributors').findBy('id', proposal.contributorId);
       proposal.contributorIpfsHash = contributor.get('ipfsHash');
 
       return this.get('kredits').addProposal(proposal)
diff --git a/app/lib/kredits/contracts/operator.js b/app/lib/kredits/contracts/operator.js
index 0ad7f8d..c3e3898 100644
--- a/app/lib/kredits/contracts/operator.js
+++ b/app/lib/kredits/contracts/operator.js
@@ -47,7 +47,7 @@ export default class Operator extends Base {
       .add(json)
       .then((ipfsHashAttr) => {
         let proposal = [
-          proposalAttr.recipientId,
+          proposalAttr.contributorId,
           proposalAttr.amount,
           ipfsHashAttr.ipfsHash,
           ipfsHashAttr.hashFunction,
diff --git a/app/models/proposal.js b/app/models/proposal.js
index 88594e4..4022ec4 100644
--- a/app/models/proposal.js
+++ b/app/models/proposal.js
@@ -5,8 +5,8 @@ import bignumber from 'kredits-web/utils/cps/bignumber';
 export default EmberObject.extend({
   // Contract
   id: bignumber('idRaw', 'toString'),
-  creatorAddress: null,
-  recipientId: bignumber('recipientIdRaw', 'toString'),
+  creatorAccount: null,
+  contributorId: bignumber('contributorIdRaw', 'toString'),
   amount: bignumber('amountRaw', 'toNumber'),
   votesCount: bignumber('votesCountRaw', 'toNumber'),
   votesNeeded: bignumber('votesNeededRaw', 'toNumber'),
diff --git a/app/utils/cps/bignumber.js b/app/utils/cps/bignumber.js
index 701eed1..f86cab2 100644
--- a/app/utils/cps/bignumber.js
+++ b/app/utils/cps/bignumber.js
@@ -1,4 +1,5 @@
 import computed from 'ember-computed';
+import ethers from 'npm:ethers';
 
 export default function(dependentKey, converterMethod) {
   return computed(dependentKey, {
@@ -6,6 +7,7 @@ export default function(dependentKey, converterMethod) {
       return this.get(dependentKey)[converterMethod]();
     },
     set (key, value) {
+      value = ethers.utils.bigNumberify(value);
       this.set(dependentKey, value);
       return value[converterMethod]();
     }
diff --git a/tests/unit/controllers/index-test.js b/tests/unit/controllers/index-test.js
index 0bce69e..76f11f1 100644
--- a/tests/unit/controllers/index-test.js
+++ b/tests/unit/controllers/index-test.js
@@ -23,9 +23,6 @@ let addFixtures = function(controller) {
     { github_username: "trinity", github_uid: "123", balance: 5000 },
     { github_username: "mouse", github_uid: "696", balance: 0 }
   ].forEach(fixture => {
-    // we expect a bignumer but I don't want to add the bignumber dependency here... so this is some hack to return an object that looks good enough for the test
-    let fakeBignumber = function(balance) { return { toNumber: function() { return balance; } }; };
-    fixture.balance = fakeBignumber(fixture.balance);
     controller.get('model.contributors').push(Contributor.create(fixture));
   });
 };