Refactoring user & card affiliations