More client/renderer decoupling