Refactor|Map Renderer|Client: Continued work on Decoration