Added basic search capability