Replaced static maps with dynamic maps