Add few dictionaries to PG #804
Fix dictionary name: CallerTypes -> CallTypes
Substitute dictionary values in ContractGenerator #569