Rework models based on CMS foundation.