diff --git a/interface.csv b/interface.csv
deleted file mode 100644
index f8171e1..0000000
--- a/interface.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-function_name,result_data_type,argument_data_types
-geocode_admin0_polygon,Geometry,"country_name text"
-geocode_admin1_polygon,Geometry,"admin1_name text"
-geocode_admin1_polygon,Geometry,"admin1_name text, country_name text"
-geocode_namedplace_point,Geometry,"city_name text"
-geocode_namedplace_point,Geometry,"city_name text, country_name text"
-geocode_namedplace_point,Geometry,"city_name text, admin1_name text, country_name text"
-geocode_postalcode_polygon,Geometry,"postal_code text, country_name text"
-geocode_postalcode_point,Geometry,"postal_code text, country_name text"
-geocode_ipaddress_point,Geometry,"ip_address text"
diff --git a/interface.yaml b/interface.yaml
index 1fbdc9d..6270999 100644
--- a/interface.yaml
+++ b/interface.yaml
@@ -13,4 +13,33 @@
   return_type: Geometry
   params:
     - { name: admin1_name,  type: text }
-    - { name: country_name, type: text }
\ No newline at end of file
+    - { name: country_name, type: text }
+
+- name: geocode_namedplace_point
+  return_type: Geometry
+  params:
+    - { name: city_name, type: text}
+
+- name: geocode_namedplace_point
+  return_type: Geometry
+  params:
+    - { name: city_name,    type: text}
+    - { name: country_name, type: text}
+
+- name: geocode_postalcode_polygon
+  return_type: Geometry
+  params:
+    - { name: postal_code,  type: text}
+    - { name: country_name, type: text}
+
+- name: geocode_postalcode_point
+  return_type: Geometry
+  params:
+    - { name: postal_code,  type: text}
+    - { name: country_name, type: text}
+
+- name: geocode_ipaddress_point
+  return_type: Geometry
+  params:
+    - { name: ip_address,  type: text}
+