Made DOC everywhere optional