Make it work on GAE