Updates to maps and strings