Simplify event store to reduce round trips