Add state machine to Message