Improved the zone logic and the JSON data storage.