GAE initial changes