Change namespace and remove permission handling