Fixed Requestor linking