Reworked configuration files and objects generated from said files.