Namespace put back in