add jsonBuilder and test cases and update data classes