Tweaked namespacing functionality