Updated EventStore interface