Reenabled MapWrapper