Card and contact refactored