E2 document - Marshaling and Correct Save to DB  changes