Small changes to Card, Repository as trait