Added model structs into JSON parsing