CQRS switch

CQRS can now be switched on and off