improved namespacing