Refactor
refactor
Add JsonBuilder
cleanup
improve JsonBuilder
refactor
refactor