Payment,shipping serialiaztion fix