Updated validation framework.
Reduced number of events in increase performance.