Added search types, etc