Add in search capability