Renderer class revised