Improving GAE support.