SOAP-2095 Introducing the DocumentContent in more places