Don't know if this is related to this PR or not, but should these classes really be in the `Document` namespace?