XD-1008: Add job instance awareness