Add client side UID fetching support