Fixed dictionary modifications with new API
Wrap long lines