Adding support for Google App Engine