1.0.4 fixes
Include node builder