Updates to manual, namespace