Node enhancements