Improved NodeFactories