Thanks Mirek,
I tried a merge but get map.hpp conflict

template <class K, class T, class V>
template <class KK, class TT>
T&  AMap<K, T, V>::GetPut_(KK&& k, TT&& x)
{
<<<<<<< HEAD
	int i = key.Find(std::forward<KK>(k));
	if(i < 0) {
		i = key.Put(k);
		if(i < value.GetCount())
			return value[i] = std::forward<TT>(x);
		return value.Add(std::forward<TT>(x));
	}
	return value[i];
=======
	bool put = false;
	int i = key.FindPut(std::forward<KK>(k), put);
	if(i < value.GetCount()) {
		if(put)
			value[i] = std::forward<TT>(x);
		return value[i];
	}
	return value.Add(std::forward<TT>(x));
>>>>>>> master
}

Will try this, Hopefully this is ok ?? :

template <class K, class T, class V>
template <class KK, class TT>
T& AMap<K, T, V>::GetPut_(KK&& k, TT&& x)
{
    bool put = false;
    int i = key.FindPut(std::forward<KK>(k), put);
    if(i < value.GetCount()) {
        if(put) {
            value[i] = std::forward<TT>(x);  // Update if a new key was inserted
        }
        return value[i];  // Return the existing or updated value
    }
    return value.Add(std::forward<TT>(x));  // Add new value if not found
}