Fix factory and add type renderer.