NodeDistance and Utils updated