Updates to work with an AppEngine backend