Add support for specifying a card type rather than just calculating it