Added Map to structure of new search