Added JSON-conversion and persisting of all fields