Update
Convert to JSONArray
Add metrics
Refactor