Added TargetProcess-OnDemand support