Improve GAE input