Feature: Added JSON support