Namespace improvements for classes [3]