Added basic search implementation