Adapted to leverage new fd-card element