Minor refactoring
Handle store event emitting in stores