Added some search capabililitties