updated mapping/stream interface