Added search functionality, add to dictionary