Updated to use doc namespaces