Namespace improvements for classes