Improve new card creation