Small refactor to Message::Base class