Adding the required changes to to a subtree split of the validation library