Changes for SMS in v2.1