Fixing namespace and completing doc