Got rid of MapFrameCommon and introduced MapContainer instead