Refactored json format with helper method
Merge branch 'lee' into develop