Some changes for the demo and the Renderer