Added Search using map