Added Location and MeetingPlace, changed JSON key formats to use _ separators