Namespace improvements for classes [4]