Added json and xml parsing