CustomerChangeEvent published after update, Minor refactoring