Added namespace isolation