Update to work with Google App Engine