Progress on adding Command/Query Factory
Progress on adding Command/Query Factory