Add json
Fixed Refactoring