Added additional message types and config options