Fixed up CFD with more card action types