Update dictionaries #1182 #1250 #1213