Add support for different JSON Formats