better handling for namespaced keys