Added requester check