Add fiche and deck support