diff --git a/client/route/src/create/create.html b/client/route/src/create/create.html
index c85ae935cd..d1f8d77e9f 100644
--- a/client/route/src/create/create.html
+++ b/client/route/src/create/create.html
@@ -12,7 +12,12 @@
                 <vn-title>Create Route</vn-title>
                 <vn-horizontal>
                     <vn-date-picker vn-one label="Date" model="$ctrl.delivery.date"></vn-date-picker>
-                    <vn-textfield vn-one label="Agency" field="$ctrl.delivery.agency"></vn-textfield>
+                    <vn-autocomplete vn-one 
+                        label="Agency"
+                        url="/route/api/Agencies"
+                        field="$ctrl.delivery.agency"
+                    >
+                    </vn-autocomplete>
                 </vn-horizontal>
                 <vn-horizontal>
                     <vn-textfield vn-one label="Driver" field="$ctrl.delivery.driver"></vn-textfield>
diff --git a/services/production/common/models/agency.js b/services/production/common/models/agency.js
deleted file mode 100644
index ac3aec84a5..0000000000
--- a/services/production/common/models/agency.js
+++ /dev/null
@@ -1,5 +0,0 @@
-var app = require('../../server/server');
-
-module.exports = function(Agency) {
-    require('../methods/agency/list.js')(Agency);
-};
\ No newline at end of file
diff --git a/services/route/server/model-config.json b/services/route/server/model-config.json
index da305afb08..837396e477 100644
--- a/services/route/server/model-config.json
+++ b/services/route/server/model-config.json
@@ -47,5 +47,9 @@
   },
   "Zone": {
     "dataSource": "vn"
+  },
+  "Agency": {
+    "dataSource": "vn",
+    "public": true
   }
 }
diff --git a/services/production/common/methods/agency/list.js b/services/service/methods/agency/list.js
similarity index 100%
rename from services/production/common/methods/agency/list.js
rename to services/service/methods/agency/list.js
diff --git a/services/service/models/agency.js b/services/service/models/agency.js
new file mode 100644
index 0000000000..51351c00a4
--- /dev/null
+++ b/services/service/models/agency.js
@@ -0,0 +1,3 @@
+module.exports = function(Agency) {
+  require('../methods/agency/list.js')(Agency);
+};
diff --git a/services/production/common/models/agency.json b/services/service/models/agency.json
similarity index 88%
rename from services/production/common/models/agency.json
rename to services/service/models/agency.json
index 69daf7b58d..bca21ae295 100644
--- a/services/production/common/models/agency.json
+++ b/services/service/models/agency.json
@@ -11,10 +11,6 @@
     "name": {
       "type": "String",
       "required": false
-    },
-    "tpv":{
-      "type": "Number",
-      "required": false
     }
   },
   "acls": [