Added search and list options