Simplify xva generator job