Added some more RequestContext stuff