client: Enhanced Link Attribution code added