Making Map more compliant somehow