Finished conversion of existing code to CQRS