ObjectMapProxy renamed to MapProxyImpl