[Yujun] Enhanced generic support.