Updated map blocks and restructuring objects