Addressed djspipe comments