Added yelp as conditional dependency