Adding support for GAE