Added JSON type support