Refactor to use JsonUtils
Add JsonUtils