extends Map, renamed to Dictionary
minor updates to Dictionary