added the cqrs hack