Merge "Add properties for EV charging"