Update for cqrs refactoring.