Update google app engine parts to latest refactorings