diff --git a/src/currencyservice/.dockerignore b/src/currencyservice/.dockerignore
index c2658d7..4d92be1 100644
--- a/src/currencyservice/.dockerignore
+++ b/src/currencyservice/.dockerignore
@@ -1 +1,2 @@
+client.js
 node_modules/
diff --git a/src/currencyservice/client.js b/src/currencyservice/client.js
index 76e54d0..519e2ad 100644
--- a/src/currencyservice/client.js
+++ b/src/currencyservice/client.js
@@ -37,11 +37,22 @@ const request = {
   to_code: 'CHF'
 };
 
-client.convert(request, function (err, response) {
+function _moneyToString (m) {
+  return `${m.amount.decimal}.${m.amount.fractional} ${m.currency_code}`;
+}
+
+client.getSupportedCurrencies({}, (err, response) => {
   if (err) {
-    console.error(err);
+    console.error(`Error in getSupportedCurrencies: ${err}`);
   } else {
-    const amount = response.amount;
-    console.log(`OUTPUT: ${amount.decimal}.${amount.fractional}`);
+    console.log(`Currency codes: ${response.currency_codes}`);
+  }
+});
+
+client.convert(request, function (err, response) {
+  if (err) {
+    console.error(`Error in convert: ${err}`);
+  } else {
+    console.log(`Convert: ${_moneyToString(request.from)} to ${_moneyToString(response)}`);
   }
 });
diff --git a/src/currencyservice/server.js b/src/currencyservice/server.js
index 655504b..2c0da2d 100644
--- a/src/currencyservice/server.js
+++ b/src/currencyservice/server.js
@@ -65,7 +65,7 @@ function _carry (amount) {
  */
 function getSupportedCurrencies (call, callback) {
   _getCurrencyData((data) => {
-    callback(null, {currency_codes: data.keys()});
+    callback(null, {currency_codes: Object.keys(data)});
   });
 }
 
@@ -91,7 +91,7 @@ function convert (call, callback) {
       });
       target.fractional = Math.round(target.fractional);
 
-      callback(null, {amount: target});
+      callback(null, {currency_code: request.to_code, amount: target});
     });
   } catch (err) {
     callback(err.message);