Rewrote in Khepri to support node package