Added namespace comments