Namespace hashmap improvements