Added functionality for link tracking