Namespace issues and doc comment