Add support for system messages