DocumentModel as a service fix