Refactored event save - 3 times faster