Fix for new dictionary API
Fix for new dictionary API
Fix for new dictionary API
Fix for new dictionary API
Fix for new dictionary API
Fix for new dictionary API
Fix for new dictionary API
Start of new API
Fix for new dictionary API
Note recent changes