Lib & Renderer Changes