Adding namespaces? Did we need to?