Added Marshalling/Unmarshallin API