Prepare for switch to nodejs