diff --git a/apiary.geojson b/apiary.geojson
index b8ef2f0..98a3c86 100644
--- a/apiary.geojson
+++ b/apiary.geojson
@@ -7,13 +7,14 @@
             "name": "Vahekoidu",
             "address": "Vahekoidu tee 6, Koidu küla, Saue vald, Harju maakond, Estonia",
             "code": "EE31636",
-            "hives": 3,
-            "hives-type": ["farrar", "langstroth", "other"],
-            "colonies": 3,
-            "colonies-race": ["italian", "carnica", "other"],
+            "type": ["permanent", "migratory"],
+            "hive-count": 3,
+            "hive-type": ["farrar", "langstroth", "other"],
+            "colony-count": 3,
+            "colony-race": ["italian", "carnica", "other"],
             "status": ["planned", "operating", "abandoned"],
-            "organic": ["true", "false", "transition"],
-            "picture": "https://mesindus.ee/files/album/IMG_8188.JPG",
+            "organic": [true, false],
+            "pictures": ["https://mesindus.ee/files/album/IMG_8188.JPG", ""],
             "beekeeper-name": "Tormi Tabor",
             "beekeeper-id": "37201045716",
             "beekeeper-phone": "+37254513000",