Put back card model to avoid regressions