Refactored nodes