Added new card token handling