Added ShortMessageManager