Added CSM functionality