Added synchronization blocks in CSSettings.