Namespace improvements for classes [2]