Fixes #11: Many white cards

Updates to data model.