Add code for search functionality and refactor code
Remove dao cause of implement generic dao
Refactor code
Refactor code