Added namespace check