Updated to new request context api.