More changes to request generation.