Improve node date management