Added enumerated card type, updated card class