[BUGFIX] Handle the new Namespaced Roles correctly