Another update of NAMESPACE