Address DocumentManager deprecation warnings