diff --git a/evcc.dist.yaml b/evcc.dist.yaml
index 392cd2928..eeafad3ef 100644
--- a/evcc.dist.yaml
+++ b/evcc.dist.yaml
@@ -48,8 +48,8 @@ vehicles:
   type: renault
   title: Zoe
   capacity: 60 # kWh
-  user: # user
-  password: # password
+  user: myuser # user
+  password: mypassword # password
   vin: WREN...
   onIdentify: # set defaults when vehicle is identified
     minSoC: 20 # charge to at least 20% independent of charge mode
@@ -100,9 +100,9 @@ loadpoints:
   disable: # pv mode disable behavior
     delay: 10m # threshold must be exceeded for this long
     threshold: 200 # maximum import power (W)
-  guardduration: 5m # switch charger contactor not more often than this (default 10m)
-  mincurrent: 6 # minimum charge current (default 6A)
-  maxcurrent: 16 # maximum charge current (default 16A)
+  guardDuration: 5m # switch charger contactor not more often than this (default 10m)
+  minCurrent: 6 # minimum charge current (default 6A)
+  maxCurrent: 16 # maximum charge current (default 16A)
 
 # tariffs are the fixed or variable tariffs
 # cheap can be used to define a tariff rate considered cheap enough for charging
diff --git a/schema.json b/schema.json
index a5e157eaa..8670ff423 100644
--- a/schema.json
+++ b/schema.json
@@ -42,7 +42,47 @@
       "type": "array",
       "description": "List of vehicles",
       "items": {
-        "$ref": "#/definitions/namedObject"
+        "$ref": "#/definitions/namedObject",
+        "properties": {
+          "title": {
+            "type": "string"
+          },
+          "capacity": {
+            "type": "integer"
+          },
+          "user": {
+            "type": "string"
+          },
+          "password": {
+            "type": "string"
+          },
+          "VIN": {
+            "type": "string"
+          },
+          "cache": {
+            "$ref": "#/definitions/duration"
+          },
+          "onIdentify": {
+            "type": "object",
+            "properties": {
+              "mode": {
+                "$ref": "#/definitions/mode"
+              },
+              "minSoC": {
+                "type": "integer"
+              },
+              "targetSoC": {
+                "type": "integer"
+              },
+              "minCurrent": {
+                "type": "integer"
+              },
+              "maxCurrent": {
+                "type": "integer"
+              }
+            }
+          }
+        }
       }
     },
     "site": {
@@ -63,10 +103,32 @@
             "pv": {
               "type": "string"
             },
+            "pvs": {
+              "description": "List of pv inverters/meters",
+              "type": "array",
+              "items": {
+                "type": "string"
+              },
+              "minItems": 1,
+              "uniqueItems": true
+            },
             "battery": {
               "type": "string"
+            },
+            "batteries": {
+              "description": "List of home batteries",
+              "type": "array",
+              "items": {
+                "type": "string"
+              },
+              "minItems": 1,
+              "uniqueItems": true
             }
           }
+        },
+        "prioritySoC": {
+        },
+        "bufferSoC": {
         }
       }
     },
@@ -129,6 +191,40 @@
                 "type": "boolean"
               }
             }
+          },
+          "phases": {
+            "type": "integer"
+          },
+          "minCurrent": {
+            "type": "integer"
+          },
+          "maxCurrent": {
+            "type": "integer"
+          },
+          "guardDuration": {
+            "$ref": "#/definitions/duration"
+          },
+          "enable": {
+            "type": "object",
+            "properties": {
+              "delay": {
+                "$ref": "#/definitions/duration"
+              },
+              "threshold": {
+                "type": "integer"
+              }
+            }
+          },
+          "disable": {
+            "type": "object",
+            "properties": {
+              "delay": {
+                "$ref": "#/definitions/duration"
+              },
+              "threshold": {
+                "type": "integer"
+              }
+            }
           }
         }
       }
@@ -176,7 +272,7 @@
     },
     "pollMode": {
       "enum": [
-        "alway",
+        "always",
         "charging",
         "connected"
       ]