Continued and refactored event storage