Made most namespaces contextually relevant