Config & Model changes. To be refined.