Performance inprovment

Rebuild the validation process