Increased compatability with GAE