Updates to maps and blocks