Re-factor, base change model
Add, base demand.
Add, dump