Move to new split command/query services