Add Search and Stream Class