Massive Updated Added Enyo Version of validator