Use bundle from new json response format
Fix compat issues with new properties