New definition for D2 and JF family.

Change-Id: Ibb98675d0a537ff2bf3bc827a989a475b4f0228c