- Added JSON handling