Added namespace class