Progress on adding Command/Query Factory