Adding GAE support