Fixed some models not working for CMS modules