few more updates for cqrs