Expanded search capabilities