Namespace improvements for classes [5]