Upgrade Scripts and reworked to support other validation points.