Added library, Stream, updated output messages accordingly