Initial checkin for link tracking support