Changes for the CMS import.