Added JSON capability