Updated Card and CardManager