maps and hashtables updated