Strictify data structures
Tweak config file
Convert to Data.Text