diff --git a/app/routes/deployments/single.js b/app/routes/deployments/single.js
index 7ef6e2b59efdef4b569491b5d3a0475b5903fe57..344ef5b113dfb49f35b9c2ae854795c82845ffb0 100644
--- a/app/routes/deployments/single.js
+++ b/app/routes/deployments/single.js
@@ -14,22 +14,14 @@ export default Ember.Route.extend({
     const createGraph = graphingService.createGraph.bind(graphingService);
 
     this.set('loading', true);
-    return Ember.RSVP.Promise.all([
-      this.store.findAll('node'),
-      this.store.findAll('nodegroup'),
-      this.store.findAll('service'),
-      this.store.findAll('serviceinstance'),
-      this.store.findAll('communication'),
-      this.store.findAll('communicationinstance')
-  ]).then(responses => {
-      return {
-        nodes: responses.get(0),
-        nodeGroups: responses.get(1),
-        services: responses.get(2),
-        serviceInstances: responses.get(3),
-        communications: responses.get(4),
-        communicationInstances: responses.get(5)
-    };}).then(createGraph).then((graph) => {
+    return Ember.RSVP.hash({
+        nodes: this.store.findAll('node'),
+        nodeGroups: this.store.findAll('nodegroup'),
+        services: this.store.findAll('service'),
+        serviceInstances: this.store.findAll('serviceinstance'),
+        communications: this.store.findAll('communication'),
+        communicationInstances: this.store.findAll('communicationinstance')
+    }).then(createGraph).then((graph) => {
       this.set('loading', false);
       return graph;
     });