Add logging and pipe-viewer