add support for system events