Added stuff to messaging system