Expanded class hierarchy of Fid