Model and Config Class Adjustments