fNode refactor