SMS: Internal improvement