Removed GAE requirement