Major changes: ready for Google App Engine