CSM changes structure