Updated Card implementation