Simplifying search support and dependencies