Add card data and fix simulator system