v0.62 refactoring event-sourcing