Added BufferedInputStream and BufferedOutputStream