Changed the way extended data is delt with so it works with DataContractJson or JSON.NET