Adjusted DPU template - TODOs better described