Revert to before storage compute
Added WH workload and recovery case