CS and Issue Model update