Added namespace, class