Added the new messages. Not yet tested/debugged