Adding Feature-based search