Refactored BookmarkCardFactory