Node4 improvements