Fixed Model raw JSON handling