update with new eventstore interface