Added basic search capabilities