Namespace improvements