More work on RenderingContext