Added Primary Keys and Fixed card_colors/card_types