Replaced dynamic maps with static maps