Updated dictionaries refs #4