Added namespace functionality