Reworked ConfigurationModel.