Map Renderer|Client: Continued working on SurfaceDecorator