Refactored Link object