More derived

[ASKDEEIPSNPPET-21-23]