Fixed Card constructor and includes