Moved event parser to use Validation too