Parser module cleanup and add event storage