Minor update
Add Message interface