Refactor event store interface