Add Message interface
Clean up broadcast pkg