Added map to deal with highlight response