Added support for node, still broken