[WIP] Refactor workload