Refactored list and search methods