Added foundation for searching