Prepare for GAE employment

Prepare for GAE employment