Suggestion done. Still need to add Search functionality.