Updated with WIP node package