Added json marshalling