Add in validate class