Added first implementation of message types