Adapt Validation to new tree structure