JSON Support

Added JSON support