Better top-level AppEngine support