Adding google app engine changes