Rename to make more sense
Add version types for JSON parsing