adding support for system messages, debuging will be added when needed