More edits to use Lokad CQRS Sample code