GAE context support added