EDF are ordered to check component records

EDF are ordered to check component records