HHH-7832 map entity mode support