Use a matching dictionary for symbols and their types
Fixes