Refatoring NodeService, part2