Undo of deletion of output batch and event classes. Added convert methods