Adding simple search capabilities