Refactor
Add search functionality