Add support for FC 2.05
Updates for new FC/NC