GAE Optimization Updates

GAE Optimization Updates