DEV-20505 bug fix
DEV-20531
DEV-20651 part 2

SMSYype and Sms  model