Better validation of nodes