Update classes for new configuration