Refactored NodeDataEntry to cutout repeated code