Implement new search format