Add better support for UID-based requests.