Updated to XE21. Switched from using deprecated Card class to new CardBuilder class