Change Renderable to use Option